bk commit into 5.1 tree (malff:1.2379)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-01-11 09:15:44-07:00, malff@weblab.(none) +2 -0
  Merge malff@stripped:/home/bk/mysql-5.1-runtime
  into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25183
  MERGE: 1.2343.16.5

  sql/set_var.cc@stripped, 2007-01-11 09:15:39-07:00, malff@weblab.(none) +0 -0
    Auto merged
    MERGE: 1.207.1.1

  sql/sql_table.cc@stripped, 2007-01-11 09:15:39-07:00, malff@weblab.(none) +0 -0
    Auto merged
    MERGE: 1.375.2.1

# 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:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-25183/RESYNC

--- 1.379/sql/sql_table.cc	2007-01-11 09:15:50 -07:00
+++ 1.380/sql/sql_table.cc	2007-01-11 09:15:50 -07:00
@@ -5405,16 +5405,19 @@ bool mysql_alter_table(THD *thd,char *ne
     {
       my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
                  ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
-      DBUG_RETURN(1);
+      DBUG_RETURN(TRUE);
     }
 
     if (wait_if_global_read_lock(thd,0,1))
-      DBUG_RETURN(1);
+      DBUG_RETURN(TRUE);
     VOID(pthread_mutex_lock(&LOCK_open));
     if (lock_table_names(thd, table_list))
+    {
+      error= TRUE;
       goto view_err;
+    }
     
-    error=0;
+    error= FALSE;
     if (!do_rename(thd, table_list, new_db, new_name, new_name, 1))
     {
       if (mysql_bin_log.is_open())
@@ -5554,6 +5557,10 @@ view_err:
       wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
       error=table->file->disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
       /* COND_refresh will be signaled in close_thread_tables() */
+      break;
+    default:
+      DBUG_ASSERT(FALSE);
+      error= 0;
       break;
     }
     if (error == HA_ERR_WRONG_COMMAND)

--- 1.208/sql/set_var.cc	2007-01-11 09:15:50 -07:00
+++ 1.209/sql/set_var.cc	2007-01-11 09:15:50 -07:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -78,7 +77,8 @@ extern my_bool innobase_log_archive,
                innobase_use_doublewrite,
                innobase_use_checksums,
                innobase_file_per_table,
-               innobase_locks_unsafe_for_binlog;
+               innobase_locks_unsafe_for_binlog,
+               innobase_rollback_on_timeout;
 
 extern "C" {
 extern ulong srv_max_buf_pool_modified_pct;
@@ -825,6 +825,7 @@ SHOW_VAR init_vars[]= {
   {sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS},
   {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG},
   {"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG },
+  {"innodb_rollback_on_timeout", (char*) &innobase_rollback_on_timeout, SHOW_MY_BOOL},
   {sys_innodb_support_xa.name, (char*) &sys_innodb_support_xa, SHOW_SYS},
   {sys_innodb_sync_spin_loops.name, (char*) &sys_innodb_sync_spin_loops, SHOW_SYS},
   {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS},