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

into mysql.com:/M50/mysql-5.0

sql/sql_db.cc

@@ -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,6 +1122,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
       system_db= 1;
       goto end;
     }
+    if (!(thd->slave_thread))
       x_free(dbname);				/* purecov: inspected */
     my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR),
                MYF(0));                         /* purecov: inspected */
@@ -1129,6 +1131,7 @@ 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);
+    if (!(thd->slave_thread))
       my_free(dbname, MYF(0));
     DBUG_RETURN(1);
   }
@@ -1159,6 +1162,7 @@ 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);
+      if (!(thd->slave_thread))
         my_free(dbname,MYF(0));
       DBUG_RETURN(1);
     }
@@ -1171,6 +1175,7 @@ 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);
+    if (!(thd->slave_thread))
       my_free(dbname,MYF(0));
     DBUG_RETURN(1);
   }
@@ -1179,6 +1184,7 @@ end:
     x_free(thd->db);
   if (dbname && dbname[0] == 0)
   {
+    if (!(thd->slave_thread))
       my_free(dbname, MYF(0));
     thd->db= NULL;
     thd->db_length= 0;