bk commit into 5.1 tree (mats:1.2557) BUG#28722

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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@stripped, 2007-06-21 13:32:23+02:00, mats@stripped +1 -0
  BUG#28722:
  Renaming variable

  sql/sql_base.cc@stripped, 2007-06-21 13:32:19+02:00, mats@stripped +5 -5
    Renaming variable.

# 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:	mats
# Host:	kindahl-laptop.dnsalias.net
# Root:	/home/bk/b28722-mysql-5.1-rpl

--- 1.411/sql/sql_base.cc	2007-06-21 13:32:33 +02:00
+++ 1.412/sql/sql_base.cc	2007-06-21 13:32:33 +02:00
@@ -4000,7 +4000,7 @@
   {
     handler::Table_flags flags_some_set= handler::Table_flags();
     handler::Table_flags flags_all_set= ~handler::Table_flags();
-    my_bool more_than_one_engine= FALSE;
+    my_bool multi_engine= FALSE;
     void* prev_ht= NULL;
     for (TABLE_LIST *table= tables; table; table= table->next_global)
     {
@@ -4012,7 +4012,7 @@
                             FLAGSTR(flags, HA_BINLOG_STMT_CAPABLE),
                             FLAGSTR(flags, HA_BINLOG_ROW_CAPABLE)));
         if (prev_ht && prev_ht != table->table->file->ht)
-          more_than_one_engine= TRUE;
+          multi_engine= TRUE;
         prev_ht= table->table->file->ht;
         flags_all_set &= flags;
         flags_some_set |= flags;
@@ -4027,8 +4027,8 @@
                         FLAGSTR(flags_some_set, HA_BINLOG_ROW_CAPABLE)));
     DBUG_PRINT("info", ("thd->variables.binlog_format: %ld",
                         thd->variables.binlog_format));
-    DBUG_PRINT("info", ("more_than_one_engine: %s",
-                        more_than_one_engine ? "TRUE" : "FALSE"));
+    DBUG_PRINT("info", ("multi_engine: %s",
+                        multi_engine ? "TRUE" : "FALSE"));
 
     int error= 0;
     if (flags_all_set == 0)
@@ -4059,7 +4059,7 @@
       statement cannot be logged atomically, so we generate an error
       rather than allowing the binlog to become corrupt.
      */
-    if (more_than_one_engine &&
+    if (multi_engine &&
         (flags_some_set & HA_HAS_OWN_BINLOGGING))
     {
       error= ER_BINLOG_LOGGING_IMPOSSIBLE;