List:Commits« Previous MessageNext Message »
From:msvensson Date:January 26 2006 1:08pm
Subject:bk commit into 4.1 tree (msvensson:1.2474) BUG#15302
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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.2474 06/01/26 14:08:31 msvensson@neptunus.(none) +2 -0
  Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
   - Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
   - Change mysqltest to detect when there aren't as many warnings available as was reported.

  sql/sql_db.cc
    1.132 06/01/26 14:08:26 msvensson@neptunus.(none) +4 -3
    Don't call "send_ok" if in silent mode.

  client/mysqltest.c
    1.190 06/01/26 14:08:26 msvensson@neptunus.(none) +4 -4
    Call "die" if warnings were reported but there weren't any warnings to retrieve

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug15302/my41-bug15302

--- 1.131/sql/sql_db.cc	2005-09-12 14:08:36 +02:00
+++ 1.132/sql/sql_db.cc	2006-01-26 14:08:26 +01:00
@@ -421,16 +421,17 @@
 
   if (my_stat(path,&stat_info,MYF(0)))
   {
-   if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS))
+    if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS))
     {
       my_error(ER_DB_CREATE_EXISTS,MYF(0),db);
       error= -1;
       goto exit;
     }
     push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
-                        ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
+			ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
+    if (!silent)
+      send_ok(thd);
     error= 0;
-    send_ok(thd);
     goto exit;
   }
   else

--- 1.189/client/mysqltest.c	2005-10-31 13:23:52 +01:00
+++ 1.190/client/mysqltest.c	2006-01-26 14:08:26 +01:00
@@ -2966,8 +2966,8 @@
 	  warn_res= mysql_store_result(mysql);
 	}
 	if (!warn_res)
-	  verbose_msg("Warning count is %u but didn't get any warnings\n",
-		      count);
+	  die("Warning count is %u but didn't get any warnings\n",
+	      count);
 	else
 	{
 	  dynstr_append_mem(ds, "Warnings:\n", 10);
@@ -3446,8 +3446,8 @@
     {
       MYSQL_RES *warn_res= mysql_store_result(mysql);
       if (!warn_res)
-        verbose_msg("Warning count is %u but didn't get any warnings\n",
-                    count);
+        die("Warning count is %u but didn't get any warnings\n",
+	    count);
       else
       {
         dynstr_append_mem(ds, "Warnings:\n", 10);
Thread
bk commit into 4.1 tree (msvensson:1.2474) BUG#15302msvensson26 Jan