List:Commits« Previous MessageNext Message »
From:msvensson Date:January 31 2006 11:53am
Subject:bk commit into 5.1 tree (msvensson:1.2077)
View as plain text  
Below is the list of changes that have just been committed into a local
5.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.2077 06/01/31 12:53:40 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302
  into  neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302

  sql/sql_db.cc
    1.126 06/01/31 12:53:34 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.175 06/01/31 12:53:34 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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/my51-bug15302/RESYNC

--- 1.125/sql/sql_db.cc	2006-01-19 03:56:00 +01:00
+++ 1.126/sql/sql_db.cc	2006-01-31 12:53:34 +01:00
@@ -391,6 +391,12 @@
   silent	Used by replication when internally creating a database.
 		In this case the entry should not be logged.
 
+  SIDE-EFFECTS
+   1. Report back to client that command succeeded (send_ok)
+   2. Report errors to client
+   3. Log event to binary log
+   (The 'silent' flags turns off 1 and 3.)
+
   RETURN VALUES
   FALSE ok
   TRUE  Error
@@ -431,17 +437,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);
-    error= 0;
+			ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
     if (!silent)
       send_ok(thd);
+    error= 0;
     goto exit;
   }
   else
Thread
bk commit into 5.1 tree (msvensson:1.2077)msvensson31 Jan