bk commit into 5.0 tree (aivanov:1.2090)

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2090 06/03/01 17:43:55 aivanov@stripped +1 -0
  Merge aivanov@stripped:/home/bk/mysql-5.0
  into  mysql.com:/home/alexi/bugs/mysql-5.0-merged

  sql/sql_db.cc
    1.127 06/03/01 17:43:51 aivanov@stripped +3 -3
    Merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aivanov
# Host:	mysqld.creware.com
# Root:	/home/alexi/bugs/mysql-5.0-merged/RESYNC

--- 1.126/sql/sql_db.cc	2006-02-25 14:57:54 +03:00
+++ 1.127/sql/sql_db.cc	2006-03-01 17:43:51 +03:00
@@ -1098,7 +1098,8 @@
 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 @@
       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 @@
   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 @@
                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 @@
   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 @@
     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;
   }