bk commit into 5.1 tree (guilhem:1.2233)

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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.2233 06/07/06 17:56:26 guilhem@stripped +5 -0
  Merge gbichot3.local:/home/mysql_src/mysql-5.1
  into  gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler

  sql/sql_insert.cc
    1.209 06/07/06 17:56:18 guilhem@stripped +0 -0
    Auto merged

  sql/sql_class.h
    1.305 06/07/06 17:56:18 guilhem@stripped +0 -0
    Auto merged

  mysql-test/t/rpl_row_create_table.test
    1.6 06/07/06 17:56:18 guilhem@stripped +0 -0
    Auto merged

  mysql-test/r/rpl_row_create_table.result
    1.6 06/07/06 17:56:18 guilhem@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.129 06/07/06 17:56:18 guilhem@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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-new-WL3146-handler/RESYNC

--- 1.304/sql/sql_class.h	2006-06-23 02:36:11 +02:00
+++ 1.305/sql/sql_class.h	2006-07-06 17:56:18 +02:00
@@ -1637,7 +1637,8 @@
   virtual bool can_rollback_data() { return 1; }
 
   // Needed for access from local class MY_HOOKS in prepare(), since thd is proteted.
-  THD *get_thd(void) { return thd; }
+  const THD *get_thd(void) { return thd; }
+  const HA_CREATE_INFO *get_create_info() { return create_info; };
 };
 
 #include <myisam.h>

--- 1.208/sql/sql_insert.cc	2006-07-06 17:53:53 +02:00
+++ 1.209/sql/sql_insert.cc	2006-07-06 17:56:18 +02:00
@@ -2732,7 +2732,8 @@
   MY_HOOKS(select_create *x) : ptr(x) { }
   virtual void do_prelock(TABLE **tables, uint count)
   {
-    if (ptr->get_thd()->current_stmt_binlog_row_based)
+    if (ptr->get_thd()->current_stmt_binlog_row_based  &&
+        !(ptr->get_create_info()->options & HA_LEX_CREATE_TMP_TABLE))
       ptr->binlog_show_create_table(tables, count);
   }
 

--- 1.128/mysql-test/mysql-test-run.pl	2006-06-28 15:27:15 +02:00
+++ 1.129/mysql-test/mysql-test-run.pl	2006-07-06 17:56:18 +02:00
@@ -216,6 +216,7 @@
 our $opt_fast;
 our $opt_force;
 our $opt_reorder;
+our $opt_enable_disabled;
 
 our $opt_gcov;
 our $opt_gcov_err;
@@ -660,6 +661,7 @@
              'netware'                  => \$opt_netware,
              'old-master'               => \$opt_old_master,
              'reorder'                  => \$opt_reorder,
+             'enable-disabled'          => \$opt_enable_disabled,
              'script-debug'             => \$opt_script_debug,
              'sleep=i'                  => \$opt_sleep,
              'socket=s'                 => \$opt_socket,
@@ -1794,11 +1796,11 @@
 
   mtr_print_thick_line();
 
-  mtr_report("Finding  Tests in the '$suite' suite");
-
   mtr_timer_start($glob_timers,"suite", 60 * $opt_suite_timeout);
 
   mtr_report("Starting Tests in the '$suite' suite");
+
+  mtr_report_tests_not_skipped_though_disabled($tests);
 
   mtr_print_header();
 

--- 1.5/mysql-test/r/rpl_row_create_table.result	2006-05-31 19:21:40 +02:00
+++ 1.6/mysql-test/r/rpl_row_create_table.result	2006-07-06 17:56:18 +02:00
@@ -178,6 +178,7 @@
 CREATE TABLE t9 LIKE tt4;
 CREATE TEMPORARY TABLE tt5 LIKE t4;
 CREATE TEMPORARY TABLE tt6 LIKE tt4;
+CREATE TEMPORARY TABLE tt7 SELECT 1;
 **** On Master ****
 SHOW CREATE TABLE t8;
 Table	t8

--- 1.5/mysql-test/t/rpl_row_create_table.test	2006-05-31 19:21:41 +02:00
+++ 1.6/mysql-test/t/rpl_row_create_table.test	2006-07-06 17:56:18 +02:00
@@ -97,6 +97,7 @@
 CREATE TABLE t9 LIKE tt4;
 CREATE TEMPORARY TABLE tt5 LIKE t4;
 CREATE TEMPORARY TABLE tt6 LIKE tt4;
+CREATE TEMPORARY TABLE tt7 SELECT 1;
 --echo **** On Master ****
 --query_vertical SHOW CREATE TABLE t8
 --query_vertical SHOW CREATE TABLE t9