From: Date: March 1 2006 2:21pm
Subject: bk commit into 5.0 tree (aivanov:1.2068) BUG#16175
List-Archive: http://lists.mysql.com/commits/3304
X-Bug: 16175
Message-Id: <E1FERGM-0005DC-D2@mysqld.creware.com>

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.2068 06/03/01 16:21:01 aivanov@stripped +1 -0
  Fixed BUG #16175: Memory leak in rpl_trigger.test
    Allocating/freeing memory for the db member of THD
    is wholy managed by slave thread.

  sql/sql_db.cc
    1.124 06/03/01 16:20:56 aivanov@stripped +10 -5
    Fixed BUG #16175: Memory leak in rpl_trigger.test
      Allocating/freeing memory for the db member of THD
      is wholy managed by slave thread.

# 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-16175

--- 1.123/sql/sql_db.cc	2006-01-31 17:14:40 +03:00
+++ 1.124/sql/sql_db.cc	2006-03-01 16:20:56 +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;
@@ -1118,7 +1119,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 */
@@ -1126,7 +1128,8 @@
   if (check_db_name(dbname))
   {
     my_error(ER_WRONG_DB_NAME, MYF(0), dbname);
-    x_free(dbname);
+    if (!(thd->slave_thread))
+      x_free(dbname);
     DBUG_RETURN(1);
   }
   DBUG_PRINT("info",("Use database: %s", dbname));
@@ -1156,7 +1159,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);
     }
   }
@@ -1168,7 +1172,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: