Merge bk-internal.mysql.com:/home/bk/mysql-3.23

into mishka.mysql.fi:/home/my/mysql-3.23


sql/sql_repl.cc:
  Auto merged

BitKeeper/etc/logging_ok

@@ -22,6 +22,7 @@ monty@bitch.mysql.fi
 monty@donna.mysql.fi
 monty@hundin.mysql.fi
 monty@mashka.mysql.fi
+monty@mishka.mysql.fi
 monty@narttu.
 monty@narttu.mysql.fi
 monty@tik.

mysql-test/t/myisam.test

@@ -284,5 +284,4 @@ insert into t1 values (1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, "Sergei");
-drop table if exists t1;
-
+drop table t1;

sql/sql_repl.cc

@@ -66,10 +66,10 @@ static int send_file(THD *thd)
   NET* net = &thd->net;
   int fd = -1,bytes, error = 1;
   char fname[FN_REFLEN+1];
-  char *buf;
   const char *errmsg = 0;
   int old_timeout;
   uint packet_len;
+  char buf[IO_SIZE];				// It's safe to alloc this
   DBUG_ENTER("send_file");
 
   // the client might be slow loading the data, give him wait_timeout to do
@@ -77,13 +77,6 @@ static int send_file(THD *thd)
   old_timeout = thd->net.timeout;
   thd->net.timeout = thd->inactive_timeout;
 
-  // spare the stack
-  if(!(buf = alloc_root(&thd->mem_root,IO_SIZE)))
-    {
-      errmsg = "Out of memory";
-      goto err;
-    }
-
   // we need net_flush here because the client will not know it needs to send
   // us the file name until it has processed the load event entry
   if (net_flush(net) || (packet_len = my_net_read(net)) == packet_error)