Commit 6493af18 authored by joerg@mysql.com's avatar joerg@mysql.com

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/M50/mysql-5.0
parents 24cb1ceb d20ccef6
......@@ -1098,7 +1098,8 @@ err:
bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
{
int length, db_length;
char *dbname=my_strdup((char*) name,MYF(MY_WME));
char *dbname= thd->slave_thread ? (char *) name :
my_strdup((char *) name, MYF(MY_WME));
char path[FN_REFLEN];
HA_CREATE_INFO create;
bool system_db= 0;
......@@ -1121,7 +1122,8 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
system_db= 1;
goto end;
}
x_free(dbname); /* purecov: inspected */
if (!(thd->slave_thread))
x_free(dbname); /* purecov: inspected */
my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR),
MYF(0)); /* purecov: inspected */
DBUG_RETURN(1); /* purecov: inspected */
......@@ -1129,7 +1131,8 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
if (check_db_name(dbname))
{
my_error(ER_WRONG_DB_NAME, MYF(0), dbname);
my_free(dbname, MYF(0));
if (!(thd->slave_thread))
my_free(dbname, MYF(0));
DBUG_RETURN(1);
}
DBUG_PRINT("info",("Use database: %s", dbname));
......@@ -1159,7 +1162,8 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
dbname);
mysql_log.write(thd, COM_INIT_DB, ER(ER_DBACCESS_DENIED_ERROR),
sctx->priv_user, sctx->priv_host, dbname);
my_free(dbname,MYF(0));
if (!(thd->slave_thread))
my_free(dbname,MYF(0));
DBUG_RETURN(1);
}
}
......@@ -1171,7 +1175,8 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
if (my_access(path,F_OK))
{
my_error(ER_BAD_DB_ERROR, MYF(0), dbname);
my_free(dbname,MYF(0));
if (!(thd->slave_thread))
my_free(dbname,MYF(0));
DBUG_RETURN(1);
}
end:
......@@ -1179,7 +1184,8 @@ end:
x_free(thd->db);
if (dbname && dbname[0] == 0)
{
my_free(dbname, MYF(0));
if (!(thd->slave_thread))
my_free(dbname, MYF(0));
thd->db= NULL;
thd->db_length= 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment