bk commit into 5.1 tree (knielsen:1.2221)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2221 06/03/24 13:54:03 knielsen@stripped +3 -0
  Merge mysqldev@win2003-x86:my/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/tmpbuild

  sql/sql_insert.cc
    1.192 06/03/24 13:53:57 knielsen@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.550 06/03/24 13:53:57 knielsen@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.92 06/03/24 13:53:57 knielsen@stripped +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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/tmpbuild/RESYNC

--- 1.549/sql/mysqld.cc	2006-03-21 20:05:49 +01:00
+++ 1.550/sql/mysqld.cc	2006-03-24 13:53:57 +01:00
@@ -8173,6 +8173,7 @@
         innobase_file_per_table,
         innobase_locks_unsafe_for_binlog;
 
+extern "C" {
 ulong srv_max_buf_pool_modified_pct;
 ulong srv_max_purge_lag;
 ulong srv_auto_extend_increment;
@@ -8181,6 +8182,7 @@
 ulong srv_thread_sleep_delay;
 ulong srv_thread_concurrency;
 ulong srv_commit_concurrency;
+}
 #endif
 
 #ifndef WITH_NDBCLUSTER_STORAGE_ENGINE

--- 1.191/sql/sql_insert.cc	2006-03-21 13:26:41 +01:00
+++ 1.192/sql/sql_insert.cc	2006-03-24 13:53:57 +01:00
@@ -2507,28 +2507,25 @@
   CREATE TABLE (SELECT) ...
 ***************************************************************************/
 
-/* HPUX compiler bug prevents this from being a local class, since then it
-   does not have access to protected member select_create::thd.
-*/
-class select_create_prepare_hooks : public TABLEOP_HOOKS {
-public:
-  select_create_prepare_hooks(select_create *x) : ptr(x) { }
-  virtual void do_prelock(TABLE **tables, uint count)
-  {
-    if (ptr->thd->current_stmt_binlog_row_based)
-      ptr->binlog_show_create_table(tables, count);
-  }
-
-private:
-  select_create *ptr;
-};
-
 int
 select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
 {
   DBUG_ENTER("select_create::prepare");
 
-  select_create_prepare_hooks hooks(this);
+  class MY_HOOKS : public TABLEOP_HOOKS {
+  public:
+    MY_HOOKS(select_create *x) : ptr(x) { }
+    virtual void do_prelock(TABLE **tables, uint count)
+    {
+      if (ptr->get_thd()->current_stmt_binlog_row_based)
+        ptr->binlog_show_create_table(tables, count);
+    }
+
+  private:
+    select_create *ptr;
+  };
+
+  MY_HOOKS hooks(this);
 
   unit= u;
   table= create_table_from_items(thd, create_info, create_table,

--- 1.91/mysql-test/mysql-test-run.pl	2006-03-23 08:22:05 +01:00
+++ 1.92/mysql-test/mysql-test-run.pl	2006-03-24 13:53:57 +01:00
@@ -1075,6 +1075,8 @@
       }
       $exe_mysql_client_test=
         mtr_exe_exists("$glob_basedir/tests/mysql_client_test",
+                       "$glob_basedir/tests/release/mysql_client_test",
+                       "$glob_basedir/tests/debug/mysql_client_test",
                        "$path_client_bindir/mysql_client_test",
 		       "/usr/bin/false");
     }
@@ -1138,6 +1140,8 @@
       $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
       $exe_mysql_client_test=
         mtr_exe_exists("$path_client_bindir/mysql_client_test",
+                       "$glob_basedir/tests/release/mysql_client_test",
+                       "$glob_basedir/tests/debug/mysql_client_test",
 		       "/usr/bin/false"); # FIXME temporary
     }