database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime

Browse Source 
into  mysql.com:/opt/local/work/mysql-5.0-17199
This commit is contained in:
konstantin@mysql.com
2006-06-27 00:52:56 +04:00
parent 8f4582db27 117b76a562
commit 4d25d2154c
25 changed files with 634 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_db.cc
View File

@ -805,8 +805,7 @@ exit:
{
if (!(thd->slave_thread)) /* a slave thread will free it itself */
x_free(thd->db);
thd->db= 0;
thd->db_length= 0;
thd->reset_db(NULL, 0);
}
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
start_waiting_global_read_lock(thd);
@ -1218,14 +1217,10 @@ end:
{
if (!(thd->slave_thread))
my_free(dbname, MYF(0));
thd->db= NULL;
thd->db_length= 0;
thd->reset_db(NULL, 0);
}
else
{
thd->db= dbname; // THD::~THD will free this
thd->db_length= db_length;
}
thd->reset_db(dbname, db_length); // THD::~THD will free this
#ifndef NO_EMBEDDED_ACCESS_CHECKS
if (!no_access_check)
sctx->db_access= db_access;