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

Merge bodhi.netgear:/opt/local/work/tmp_merge

Browse Source 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
This commit is contained in:
konstantin@bodhi.netgear
2006-07-06 22:55:48 +04:00
parent f22a50a93b e29ea3f2ef
commit 01bc761690
31 changed files with 649 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_db.cc
View File

@ -930,8 +930,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);
@ -1345,14 +1344,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;