List:Commits« Previous MessageNext Message »
From:guilhem Date:December 14 2005 3:45pm
Subject:bk commit into 5.1 tree (guilhem:1.1961)
View as plain text  
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.1961 05/12/14 16:45:07 guilhem@stripped +43 -0
  WL#1012 "row-based replication" 1) fixes after merge of 5.1-new
  2) new option in debug builds --binlog-no-xid, to make SHOW BINLOG EVENTS deterministic
  3) cleanup of old comments
  4) RBR now compiled-in by default like will be in 5.1-new.

  sql/table.cc
    1.190 05/12/14 16:45:02 guilhem@stripped +1 -1
    fix after merge (openfrm() was renamed and changed)

  sql/sql_table.cc
    1.284 05/12/14 16:45:02 guilhem@stripped +2 -1
    fix after merge

  sql/share/errmsg.txt
    1.58 05/12/14 16:45:01 guilhem@stripped +7 -0
    fix after merge

  sql/rpl_tblmap.cc
    1.6 05/12/14 16:45:01 guilhem@stripped +1 -1
    fix after merge

  sql/mysqld.cc
    1.503 05/12/14 16:45:01 guilhem@stripped +9 -0
    new option (in debug builds only, and only for testing purposes, like --abort-slave-event-count): --binlog-no-xid

  sql/log_event.h
    1.145 05/12/14 16:45:01 guilhem@stripped +4 -0
    --binlog-no-xid

  sql/log_event.cc
    1.201 05/12/14 16:45:01 guilhem@stripped +32 -18
    - support for --binlog-no-xid
    - fix after merge: TABLE_SHARE::db and TABLE_SHARE::table_name are now LEX_STRINGs.

  mysql-test/t/user_var.test
    1.34 05/12/14 16:45:01 guilhem@stripped +0 -7
    cleanup

  mysql-test/t/rpl_temporary.test
    1.4 05/12/14 16:45:01 guilhem@stripped +0 -4
    cleanup

  mysql-test/t/rpl_sp004.test
    1.9 05/12/14 16:45:01 guilhem@stripped +0 -3
    cleanup

  mysql-test/t/rpl_replicate_do.test
    1.28 05/12/14 16:45:01 guilhem@stripped +0 -3
    cleanup

  mysql-test/t/rpl_loadfile.test
    1.7 05/12/14 16:45:01 guilhem@stripped +0 -2
    cleanup

  mysql-test/t/rpl_loaddata_s.test
    1.5 05/12/14 16:45:01 guilhem@stripped +0 -2
    cleanup

  mysql-test/t/rpl_loaddata2.test
    1.4 05/12/14 16:45:01 guilhem@stripped +0 -2
    cleanup

  mysql-test/t/rpl_flushlog_loop.test
    1.6 05/12/14 16:45:01 guilhem@stripped +0 -2
    cleanup

  mysql-test/t/rpl_bit_npk.test
    1.3 05/12/14 16:45:01 guilhem@stripped +0 -3
    cleanup

  mysql-test/t/rpl_bit.test
    1.4 05/12/14 16:45:01 guilhem@stripped +0 -3
    cleanup

  mysql-test/t/rpl_LD_INFILE.test
    1.7 05/12/14 16:45:01 guilhem@stripped +0 -2
    cleanup

  mysql-test/t/rpl_000015.test
    1.5 05/12/14 16:45:01 guilhem@stripped +0 -4
    cleanup

  mysql-test/t/innodb_concurrent.test
    1.2 05/12/14 16:45:01 guilhem@stripped +4 -0
    it's a big test (agreed with Elliot)

  mysql-test/t/flush_block_commit.test
    1.12 05/12/14 16:45:01 guilhem@stripped +0 -4
    cleanup

  mysql-test/t/disabled.def
    1.19 05/12/14 16:45:01 guilhem@stripped +1 -1
    comment

  mysql-test/r/rpl_row_rewrt_db.result
    1.2 05/12/14 16:45:00 guilhem@stripped +3 -3
    fix after merge

  mysql-test/r/rpl_row_mystery22.result
    1.2 05/12/14 16:45:00 guilhem@stripped +4 -0
    had forgotten to update this result

  mysql-test/r/binlog_stm_mix_innodb_myisam.result
    1.28 05/12/14 16:45:00 guilhem@stripped +34 -34
    result update

  mysql-test/r/binlog_stm_binlog.result
    1.9 05/12/14 16:45:00 guilhem@stripped +2 -2
    result update

  mysql-test/r/binlog_row_mix_innodb_myisam.result
    1.3 05/12/14 16:45:00 guilhem@stripped +60 -10
    result update

  mysql-test/r/binlog_row_blackhole.result
    1.3 05/12/14 16:45:00 guilhem@stripped +22 -0
    this result should have been updated in a former merge.
    The presence of COMMIT in SHOW BINLOG EVENTS, for autocommit statements, is understandable
    (ha_blackhole says it supports transactions but never calls trans_register_ha)
    but I still asked Serg to advise if this is correct.

  mysql-test/r/binlog_row_binlog.result
    1.2 05/12/14 16:45:00 guilhem@stripped +2 -2
    result update

  mysql-test/mysql-test-run.sh
    1.282 05/12/14 16:45:00 guilhem@stripped +3 -0
    add option to not print XID in SHOW BINLOG EVENTS

  mysql-test/mysql-test-run.pl
    1.44 05/12/14 16:45:00 guilhem@stripped +2 -0
    add option to not print XID in SHOW BINLOG EVENTS

  mysql-test/extra/rpl_tests/rpl_multi_update3.test
    1.10 05/12/14 16:45:00 guilhem@stripped +0 -3
    cleanup (test passes in RBR now)

  mysql-test/extra/rpl_tests/rpl_foreign_key.test
    1.7 05/12/14 16:45:00 guilhem@stripped +0 -3
    cleanup

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
    1.23 05/12/14 16:45:00 guilhem@stripped +1 -12
    XID is gone from SHOW BINLOG EVENTS in this test, only if it's a debug build

  mysql-test/extra/binlog_tests/insert_select-binlog.test
    1.6 05/12/14 16:45:00 guilhem@stripped +0 -3
    cleanup

  mysql-test/extra/binlog_tests/innodb_stat.test
    1.5 05/12/14 16:45:00 guilhem@stripped +0 -1
    cleanup

  mysql-test/extra/binlog_tests/drop_temp_table.test
    1.12 05/12/14 16:45:00 guilhem@stripped +0 -3
    cleanup

  mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
    1.9 05/12/14 16:45:00 guilhem@stripped +0 -3
    cleanup

  mysql-test/extra/binlog_tests/ctype_cp932.test
    1.12 05/12/14 16:45:00 guilhem@stripped +0 -2
    cleanup

  mysql-test/extra/binlog_tests/blackhole.test
    1.9 05/12/14 16:45:00 guilhem@stripped +0 -6
    cleanup

  mysql-test/extra/binlog_tests/binlog.test
    1.8 05/12/14 16:45:00 guilhem@stripped +2 -3
    XID is gone from SHOW BINLOG EVENTS in this test, only in debug builds.

  config/ac-macros/replication.m4
    1.4 05/12/14 16:44:59 guilhem@stripped +6 -2
    RBR now compiled-in by default

  BUILD/SETUP.sh
    1.56 05/12/14 16:44:59 guilhem@stripped +3 -3
    RBR now compiled-in by default

# 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-wl1012-v3

--- 1.281/mysql-test/mysql-test-run.sh	2005-12-13 16:10:47 +01:00
+++ 1.282/mysql-test/mysql-test-run.sh	2005-12-14 16:45:00 +01:00
@@ -1290,6 +1290,7 @@
           --innodb_data_file_path=ibdata1:128M:autoextend \
 	  --open-files-limit=1024 \
           --log-bin-trust-function-creators \
+          --loose-binlog-no-xid \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
@@ -1311,6 +1312,7 @@
           --language=$LANGUAGE \
           --innodb_data_file_path=ibdata1:128M:autoextend \
           --log-bin-trust-function-creators \
+          --loose-binlog-no-xid \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
@@ -1444,6 +1446,7 @@
           --master-retry-count=10 \
           -O slave_net_timeout=10 \
           --log-bin-trust-function-creators \
+          --loose-binlog-no-xid \
            $SMALL_SERVER \
            $EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT"
   CUR_MYERR=$slave_err

--- 1.200/sql/log_event.cc	2005-12-13 16:10:48 +01:00
+++ 1.201/sql/log_event.cc	2005-12-14 16:45:01 +01:00
@@ -3384,12 +3384,17 @@
   Xid_log_event methods
 **************************************************************************/
 
+#ifndef DBUG_OFF
+my_bool binlog_no_xid;
+#endif
+
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
 void Xid_log_event::pack_info(Protocol *protocol)
 {
   char buf[128], *pos;
   pos= strmov(buf, "COMMIT /* xid=");
-  pos= longlong10_to_str(xid, pos, 10);
+  if (!binlog_no_xid)
+    pos= longlong10_to_str(xid, pos, 10);
   pos= strmov(pos, " */");
   protocol->store(buf, (uint) (pos-buf), &my_charset_bin);
 }
@@ -4986,14 +4991,22 @@
 	Rows_log_event member functions
 **************************************************************************/
 
+/*
+  In TABLE_SHARE, "db" and "table_name" are 0-terminated (see this comment in
+  table.cc / alloc_table_share():
+    Use the fact the key is db/0/table_name/0
+  We rely on this to be sure the m_dbnam and m_tblnam members of
+  Rows_log_event and Table_map_log_event are 0-terminated.
+*/
+
 #ifndef MYSQL_CLIENT
 Rows_log_event::Rows_log_event(THD *thd_arg, TABLE *tbl_arg, ulong tid,
                                MY_BITMAP const *cols, bool is_transactional)
   : Log_event(thd_arg, 0, is_transactional),
-    m_dbnam(tbl_arg->s->db), m_dblen(m_dbnam ? strlen(m_dbnam) : 0),
+    m_dbnam(tbl_arg->s->db.str), m_dblen(m_dbnam ? tbl_arg->s->db.length : 0),
     m_table(tbl_arg),
-    m_tblnam(tbl_arg->s->table_name),
-    m_tbllen(strlen(tbl_arg->s->table_name)),
+    m_tblnam(tbl_arg->s->table_name.str),
+    m_tbllen(tbl_arg->s->table_name.length), //m_tbl should be LEX_STRING*
     m_table_id(tid),
     m_width(tbl_arg->s->fields),
     m_rows_buf(my_malloc(opt_binlog_rows_event_max_size * sizeof(*m_rows_buf), MYF(MY_WME))),
@@ -5204,8 +5217,9 @@
 
     for ( ; ; )
     {
-      table_list.db= const_cast<char*>(table->s->db);
-      table_list.alias= table_list.table_name= const_cast<char*>(table->s->table_name);
+      table_list.db= const_cast<char*>(table->s->db.str);
+      table_list.alias= table_list.table_name=
+        const_cast<char*>(table->s->table_name.str);
 
       if ((error= lock_tables(thd, &table_list, count, &need_reopen)) == 0)
         break;
@@ -5220,8 +5234,8 @@
         we need to store a local copy of the table names since the table object
         will become invalid after close_tables_for_reopen
       */
-      char *db= my_strdup(table->s->db,MYF(MY_WME));
-      char *table_name= my_strdup(table->s->table_name,MYF(MY_WME));
+      char *db= my_strdup(table->s->db.str, MYF(MY_WME));
+      char *table_name= my_strdup(table->s->table_name.str, MYF(MY_WME));
 
       if (db == 0 || table_name == 0)
       {
@@ -5523,10 +5537,10 @@
                                          bool is_transactional, uint16 flags)
   : Log_event(thd, 0, is_transactional),
     m_table(tbl),
-    m_dbnam(tbl->s->db),
-    m_dblen(m_dbnam ? strlen(m_dbnam) : 0),
-    m_tblnam(tbl->s->table_name),
-    m_tbllen(strlen(m_tblnam)),
+    m_dbnam(tbl->s->db.str),
+    m_dblen(m_dbnam ? tbl->s->db.length : 0),
+    m_tblnam(tbl->s->table_name.str),
+    m_tbllen(tbl->s->table_name.length),
     m_colcnt(tbl->s->fields), m_coltype(0),
     m_table_id(tid),
     m_flags(flags)
@@ -5659,8 +5673,8 @@
   DBUG_ASSERT(table_list->next_global == 0);
   for (TABLE *table= thd->open_tables; table ; table= table->next)
   {
-    if (strcmp(table->s->db, table_list->db) == 0
-	&& strcmp(table->s->table_name, table_list->table_name) == 0)
+    if (strcmp(table->s->db.str, table_list->db) == 0
+	&& strcmp(table->s->table_name.str, table_list->table_name) == 0)
     {
       /* Copy the table pointer into the table list. */
       table_list->table= table;
@@ -5822,20 +5836,20 @@
        */
       if (col == tsh->fields)
       {
-        DBUG_ASSERT(tsh->db && tsh->table_name);
+        DBUG_ASSERT(tsh->db.str && tsh->table_name.str);
         slave_print_msg(ERROR_LEVEL, rli, ER_BINLOG_ROW_WRONG_TABLE_DEF,
                         "Table width mismatch - "
                         "received %u columns, %s.%s has %u columns",
-                        m_colcnt, tsh->db, tsh->table_name, tsh->fields);
+                        m_colcnt, tsh->db.str, tsh->table_name.str, tsh->fields);
       }
       else
       {
         DBUG_ASSERT(col < m_colcnt && col < tsh->fields);
-        DBUG_ASSERT(tsh->db && tsh->table_name);
+        DBUG_ASSERT(tsh->db.str && tsh->table_name.str);
         slave_print_msg(ERROR_LEVEL, rli, ER_BINLOG_ROW_WRONG_TABLE_DEF,
                         "Column %d type mismatch - "
                         "received type %d, %s.%s has type %d",
-                        col, m_coltype[col], tsh->db, tsh->table_name, 
+                        col, m_coltype[col], tsh->db.str, tsh->table_name.str,
                         m_table->field[col]->type());
       }
 

--- 1.144/sql/log_event.h	2005-12-12 12:21:47 +01:00
+++ 1.145/sql/log_event.h	2005-12-14 16:45:01 +01:00
@@ -1202,6 +1202,10 @@
 typedef ulonglong my_xid; // this line is the same as in handler.h
 #endif
 
+#ifndef DBUG_OFF
+extern my_bool binlog_no_xid;
+#endif
+
 class Xid_log_event: public Log_event
 {
  public:

--- 1.502/sql/mysqld.cc	2005-12-13 16:10:48 +01:00
+++ 1.503/sql/mysqld.cc	2005-12-14 16:45:01 +01:00
@@ -4559,6 +4559,9 @@
   OPT_REPLICATE_IGNORE_DB,     OPT_LOG_SLAVE_UPDATES,
   OPT_BINLOG_DO_DB,            OPT_BINLOG_IGNORE_DB,
   OPT_BINLOG_FORMAT,
+#ifndef DBUG_OFF
+  OPT_BINLOG_NO_XID,
+#endif
 #ifdef HAVE_ROW_BASED_REPLICATION
   OPT_BINLOG_ROWS_EVENT_MAX_SIZE, 
 #endif
@@ -4809,6 +4812,12 @@
   {"binlog-ignore-db", OPT_BINLOG_IGNORE_DB,
    "Tells the master that updates to the given database should not be logged tothe binary log.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifndef DBUG_OFF
+  {"binlog-no-xid", OPT_BINLOG_NO_XID,
+   "For testing: do not display the XID in SHOW BINLOG EVENTS",
+   (gptr*) &binlog_no_xid, (gptr*) &binlog_no_xid, 0, GET_BOOL,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
 #ifdef HAVE_ROW_BASED_REPLICATION
   {"binlog-row-event-max-size", OPT_BINLOG_ROWS_EVENT_MAX_SIZE,
    "The maximum size of a row-based binary log event in bytes. Rows will be "

--- 1.283/sql/sql_table.cc	2005-12-13 16:10:49 +01:00
+++ 1.284/sql/sql_table.cc	2005-12-14 16:45:02 +01:00
@@ -291,6 +291,7 @@
       built_query.append("DROP TABLE IF EXISTS ");
     else
       built_query.append("DROP TABLE ");
+  }
   /*
     If we have the table in the definition cache, we don't have to check the
     .frm file to find if the table is a normal table (not view) and what
@@ -4828,7 +4829,7 @@
     goto err;
   }
   thd->proc_info="end";
-  
+
   DBUG_ASSERT(!(mysql_bin_log.is_open() && binlog_row_based &&
                 (create_info->options & HA_LEX_CREATE_TMP_TABLE)));
   write_bin_log(thd, TRUE, thd->query, thd->query_length);

--- 1.189/sql/table.cc	2005-12-13 16:10:49 +01:00
+++ 1.190/sql/table.cc	2005-12-14 16:45:02 +01:00
@@ -596,7 +596,6 @@
   if (!(record= (char *) alloc_root(&share->mem_root,
                                     rec_buff_length)))
     goto err;                                   /* purecov: inspected */
-  outparam->write_row_record= NULL;
   share->default_values= (byte *) record;
   if (my_pread(file,(byte*) record, (uint) share->reclength,
                record_offset, MYF(MY_NABP)))
@@ -1206,6 +1205,7 @@
   outparam->in_use= thd;
   outparam->s= share;
   outparam->db_stat= db_stat;
+  outparam->write_row_record= NULL;
 
   init_sql_alloc(&outparam->mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
   *root_ptr= &outparam->mem_root;

--- 1.57/sql/share/errmsg.txt	2005-12-13 16:10:48 +01:00
+++ 1.58/sql/share/errmsg.txt	2005-12-14 16:45:01 +01:00
@@ -5725,3 +5725,10 @@
 	eng "Plugin '%-.64s' is not loaded"
 ER_WRONG_VALUE
 	eng "Incorrect %-.32s value: '%-.128s'"
+ER_BINLOG_ROW_LOGGING_FAILED
+	eng "Writing one row to the row-based binary log failed"
+ER_BINLOG_ROW_WRONG_TABLE_DEF
+	eng "Table definition on master and slave does not match"
+ER_BINLOG_ROW_RBR_TO_SBR
+	eng "Slave running with --log-slave-updates must use row-based binary logging to be able to replicate row-based binary log events"
+

--- 1.8/mysql-test/extra/binlog_tests/blackhole.test	2005-12-13 16:10:47 +01:00
+++ 1.9/mysql-test/extra/binlog_tests/blackhole.test	2005-12-14 16:45:00 +01:00
@@ -4,12 +4,6 @@
 #
 -- source include/have_blackhole.inc
 
-#
-# The test is dependent on statement-based logging since it uses SHOW
-# BINLOG EVENTS below. 
-#
-#-- source include/have_binlog_format_statement.inc
-
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings

--- 1.1/mysql-test/t/innodb_concurrent.test	2005-11-30 08:21:37 +01:00
+++ 1.2/mysql-test/t/innodb_concurrent.test	2005-12-14 16:45:01 +01:00
@@ -5,6 +5,10 @@
 #
 # two non-interfering UPDATE's not changing result set
 #
+
+# test takes circa 5 minutes to run, so it's big
+-- source include/big_test.inc
+
 connection default;
 drop table if exists t1;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;

--- 1.9/mysql-test/extra/rpl_tests/rpl_multi_update3.test	2005-10-20 21:57:47 +02:00
+++ 1.10/mysql-test/extra/rpl_tests/rpl_multi_update3.test	2005-12-14 16:45:00 +01:00
@@ -1,6 +1,3 @@
-#08/11/2005 Changed to stm based currently due to crash in rbr Bug#12134
-#TODO: Removed have_binlog_format_statement.inc once 12134 is patched
---source include/have_binlog_format_statement.inc
 -- source include/master-slave.inc
 
 ##############################################################################

--- 1.27/mysql-test/r/binlog_stm_mix_innodb_myisam.result	2005-11-19 16:14:04 +01:00
+++ 1.28/mysql-test/r/binlog_stm_mix_innodb_myisam.result	2005-12-14 16:45:00 +01:00
@@ -11,7 +11,7 @@
 master-bin.000001	102	Query	1	#	use `test`; BEGIN
 master-bin.000001	170	Query	1	#	use `test`; insert into t1 values(1)
 master-bin.000001	257	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	351	Xid	1	#	COMMIT /* xid=2182 */
+master-bin.000001	351	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -47,7 +47,7 @@
 master-bin.000001	342	Query	1	#	use `test`; insert into t1 values(4)
 master-bin.000001	429	Query	1	#	use `test`; insert into t2 select * from t1
 master-bin.000001	523	Query	1	#	use `test`; rollback to savepoint my_savepoint
-master-bin.000001	620	Xid	1	#	COMMIT /* xid=2199 */
+master-bin.000001	620	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -74,7 +74,7 @@
 master-bin.000001	429	Query	1	#	use `test`; insert into t2 select * from t1
 master-bin.000001	523	Query	1	#	use `test`; rollback to savepoint my_savepoint
 master-bin.000001	620	Query	1	#	use `test`; insert into t1 values(7)
-master-bin.000001	707	Xid	1	#	COMMIT /* xid=2211 */
+master-bin.000001	707	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -101,7 +101,7 @@
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Query	1	#	use `test`; insert into t1 values(9)
-master-bin.000001	189	Xid	1	#	COMMIT /* xid=2234 */
+master-bin.000001	189	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	216	Query	1	#	use `test`; insert into t2 select * from t1
 delete from t1;
 delete from t2;
@@ -112,18 +112,18 @@
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Query	1	#	use `test`; insert into t1 values(10)
-master-bin.000001	190	Xid	1	#	COMMIT /* xid=2240 */
+master-bin.000001	190	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	217	Query	1	#	use `test`; insert into t2 select * from t1
 insert into t1 values(11);
 commit;
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Query	1	#	use `test`; insert into t1 values(10)
-master-bin.000001	190	Xid	1	#	COMMIT /* xid=2240 */
+master-bin.000001	190	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	217	Query	1	#	use `test`; insert into t2 select * from t1
 master-bin.000001	311	Query	1	#	use `test`; BEGIN
 master-bin.000001	379	Query	1	#	use `test`; insert into t1 values(11)
-master-bin.000001	467	Xid	1	#	COMMIT /* xid=2242 */
+master-bin.000001	467	Xid	1	#	COMMIT /* xid= */
 alter table t2 engine=INNODB;
 delete from t1;
 delete from t2;
@@ -137,7 +137,7 @@
 master-bin.000001	102	Query	1	#	use `test`; BEGIN
 master-bin.000001	170	Query	1	#	use `test`; insert into t1 values(12)
 master-bin.000001	258	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	352	Xid	1	#	COMMIT /* xid=2252 */
+master-bin.000001	352	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -161,7 +161,7 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Query	1	#	use `test`; BEGIN
 master-bin.000001	170	Query	1	#	use `test`; insert into t1 values(14)
-master-bin.000001	258	Xid	1	#	COMMIT /* xid=2268 */
+master-bin.000001	258	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -182,7 +182,7 @@
 master-bin.000001	102	Query	1	#	use `test`; BEGIN
 master-bin.000001	170	Query	1	#	use `test`; insert into t1 values(16)
 master-bin.000001	258	Query	1	#	use `test`; insert into t1 values(18)
-master-bin.000001	346	Xid	1	#	COMMIT /* xid=2279 */
+master-bin.000001	346	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 alter table t2 type=MyISAM;
@@ -229,30 +229,30 @@
 select get_lock("lock1",60);
 get_lock("lock1",60)
 1
-show binlog events from 98;
+show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	#	use `test`; BEGIN
-master-bin.000001	166	Query	1	#	use `test`; insert into t1 values(16)
-master-bin.000001	254	Query	1	#	use `test`; insert into t1 values(18)
-master-bin.000001	342	Xid	1	#	COMMIT /* xid=105 */
-master-bin.000001	369	Query	1	#	use `test`; delete from t1
-master-bin.000001	446	Xid	1	#	COMMIT /* xid=114 */
-master-bin.000001	473	Query	1	#	use `test`; delete from t2
-master-bin.000001	550	Xid	1	#	COMMIT /* xid=115 */
-master-bin.000001	577	Query	1	#	use `test`; alter table t2 type=MyISAM
-master-bin.000001	666	Query	1	#	use `test`; insert into t1 values (1)
-master-bin.000001	754	Xid	1	#	COMMIT /* xid=117 */
-master-bin.000001	781	Query	1	#	use `test`; insert into t2 values (20)
-master-bin.000001	870	Query	1	#	use `test`; drop table t1,t2
-master-bin.000001	949	Query	1	#	use `test`; create temporary table ti (a int) engine=innodb
-master-bin.000001	1059	Query	1	#	use `test`; insert into ti values(1)
-master-bin.000001	1146	Xid	1	#	COMMIT /* xid=132 */
-master-bin.000001	1173	Query	1	#	use `test`; create temporary table t1 (a int) engine=myisam
-master-bin.000001	1283	Query	1	#	use `test`; insert t1 values (1)
-master-bin.000001	1366	Query	1	#	use `test`; create table t0 (n int)
-master-bin.000001	1452	Query	1	#	use `test`; insert t0 select * from t1
-master-bin.000001	1541	Query	1	#	use `test`; insert into t0 select GET_LOCK("lock1",null)
-master-bin.000001	1648	Query	1	#	use `test`; create table t2 (n int) engine=innodb
-master-bin.000001	1748	Query	1	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
+master-bin.000001	102	Query	1	#	use `test`; BEGIN
+master-bin.000001	170	Query	1	#	use `test`; insert into t1 values(16)
+master-bin.000001	258	Query	1	#	use `test`; insert into t1 values(18)
+master-bin.000001	346	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	373	Query	1	#	use `test`; delete from t1
+master-bin.000001	450	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	477	Query	1	#	use `test`; delete from t2
+master-bin.000001	554	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	581	Query	1	#	use `test`; alter table t2 type=MyISAM
+master-bin.000001	670	Query	1	#	use `test`; insert into t1 values (1)
+master-bin.000001	758	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	785	Query	1	#	use `test`; insert into t2 values (20)
+master-bin.000001	874	Query	1	#	use `test`; drop table t1,t2
+master-bin.000001	953	Query	1	#	use `test`; create temporary table ti (a int) engine=innodb
+master-bin.000001	1063	Query	1	#	use `test`; insert into ti values(1)
+master-bin.000001	1150	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	1177	Query	1	#	use `test`; create temporary table t1 (a int) engine=myisam
+master-bin.000001	1287	Query	1	#	use `test`; insert t1 values (1)
+master-bin.000001	1370	Query	1	#	use `test`; create table t0 (n int)
+master-bin.000001	1456	Query	1	#	use `test`; insert t0 select * from t1
+master-bin.000001	1545	Query	1	#	use `test`; insert into t0 select GET_LOCK("lock1",null)
+master-bin.000001	1652	Query	1	#	use `test`; create table t2 (n int) engine=innodb
+master-bin.000001	1752	Query	1	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
 do release_lock("lock1");
 drop table t0,t2;

--- 1.1/mysql-test/r/rpl_row_mystery22.result	2005-12-12 16:33:07 +01:00
+++ 1.2/mysql-test/r/rpl_row_mystery22.result	2005-12-14 16:45:00 +01:00
@@ -18,6 +18,10 @@
 create table t2(n int);
 drop table t2;
 insert into t1 values(NULL,'new');
+set sql_log_bin=0;
+insert into t1 values(NULL,'new');
+set sql_log_bin=1;
+delete from t1 where n=4;
 start slave;
 select * from t1 order by n;
 n	s

--- 1.1/mysql-test/r/rpl_row_rewrt_db.result	2005-09-29 09:49:12 +02:00
+++ 1.2/mysql-test/r/rpl_row_rewrt_db.result	2005-12-14 16:45:00 +01:00
@@ -67,9 +67,9 @@
 create table t1 (a int, b char(10));
 load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
-Warning	1264	Out of range value adjusted for column 'a' at row 5
+Warning	1264	Out of range value for column 'a' at row 5
 Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 select * from rewrite.t1;
 a	b
@@ -81,7 +81,7 @@
 truncate table t1;
 load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 Warning	1261	Row 4 doesn't contain data for all columns
 select * from rewrite.t1;
 a	b

--- 1.11/mysql-test/extra/binlog_tests/drop_temp_table.test	2005-11-04 10:43:44 +01:00
+++ 1.12/mysql-test/extra/binlog_tests/drop_temp_table.test	2005-12-14 16:45:00 +01:00
@@ -1,6 +1,3 @@
-# Requires statement logging
-#-- source include/have_binlog_format_statement.inc
-
 # Embedded server doesn't support binlog
 -- source include/not_embedded.inc
 

--- 1.11/mysql-test/t/flush_block_commit.test	2005-09-19 16:07:30 +02:00
+++ 1.12/mysql-test/t/flush_block_commit.test	2005-12-14 16:45:01 +01:00
@@ -3,10 +3,6 @@
 # We verify that we did not introduce a deadlock.
 # This is intended to mimick how mysqldump and innobackup work.
 
-# Requires statement logging
-#-- source include/have_binlog_format_statement.inc
-# Passed using row based bin log format with latest wl1012 clone [jbm]
-
 # This test doesn't work with the embedded server
 -- source include/not_embedded.inc
 

--- 1.22/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2005-11-21 11:07:03 +01:00
+++ 1.23/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2005-12-14 16:45:00 +01:00
@@ -5,12 +5,11 @@
 # did some tests manually on a slave; tables are replicated fine and
 # Exec_Master_Log_Pos advances as expected.
 
-#-- source include/have_binlog_format_statement.inc
-
 # Embedded server doesn't support binlogging
 -- source include/not_embedded.inc
 
 -- source include/have_innodb.inc
+-- source include/have_debug.inc
 
 --disable_warnings
 drop table if exists t1, t2;
@@ -31,7 +30,6 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=15" "xid=8"
 show binlog events from 102;
 
 delete from t1;
@@ -60,7 +58,6 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=48" "xid=25"
 show binlog events from 102;
 
 delete from t1;
@@ -78,7 +75,6 @@
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
---replace_result "xid=70" "xid=37"
 show binlog events from 102;
 
 # and when ROLLBACK is not explicit?
@@ -111,7 +107,6 @@
 insert into t2 select * from t1;
 
 --replace_column 5 #
---replace_result "xid=119" "xid=60"
 show binlog events from 102;
 
 # Check that when the query updat1ng the MyISAM table is the first in the
@@ -124,13 +119,11 @@
 begin;
 insert into t2 select * from t1;
 --replace_column 5 #
---replace_result "xid=133" "xid=66"
 show binlog events from 102;
 insert into t1 values(11);
 commit;
 
 --replace_column 5 #
---replace_result "xid=133" "xid=66" "xid=136" "xid=68"
 show binlog events from 102;
 
 
@@ -149,7 +142,6 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=155" "xid=78"
 show binlog events from 102;
 
 delete from t1;
@@ -177,7 +169,6 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=187" "xid=94"
 show binlog events from 102;
 
 delete from t1;
@@ -195,7 +186,6 @@
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
---replace_result "xid=208" "xid=105"
 show binlog events from 102;
 
 # Test for BUG#5714, where a MyISAM update in the transaction used to
@@ -256,7 +246,6 @@
 connection con3;
 select get_lock("lock1",60);
 --replace_column 5 #
---replace_result "xid=208" "xid=105" "xid=227" "xid=114" "xid=230" "xid=115" "xid=234" "xid=117" "xid=261" "xid=132"
 show binlog events from 102;
 do release_lock("lock1");
 drop table t0,t2;

--- 1.8/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test	2005-09-19 17:13:11 +02:00
+++ 1.9/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test	2005-12-14 16:45:00 +01:00
@@ -1,6 +1,3 @@
-# Requires statement logging
-#-- source include/have_binlog_format_statement.inc
-
 --source include/not_embedded.inc
 --source include/have_ucs2.inc
 

--- 1.5/mysql-test/extra/binlog_tests/insert_select-binlog.test	2005-09-19 17:13:11 +02:00
+++ 1.6/mysql-test/extra/binlog_tests/insert_select-binlog.test	2005-12-14 16:45:00 +01:00
@@ -1,6 +1,3 @@
-# Requires statement logging
-#-- source include/have_binlog_format_statement.inc
-
 # Embedded server doesn't support binlog
 -- source include/not_embedded.inc
 

--- 1.1/mysql-test/r/binlog_row_binlog.result	2005-10-18 16:32:08 +02:00
+++ 1.2/mysql-test/r/binlog_row_binlog.result	2005-12-14 16:45:00 +01:00
@@ -19,7 +19,7 @@
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	1	#	test.t2
 master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=12 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
 drop table t1,t2;
 reset master;
 create table t1 (n int) engine=innodb;
@@ -230,7 +230,7 @@
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=19 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002' from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

--- 1.2/mysql-test/r/binlog_row_blackhole.result	2005-10-24 20:01:36 +02:00
+++ 1.3/mysql-test/r/binlog_row_blackhole.result	2005-12-14 16:45:00 +01:00
@@ -111,13 +111,35 @@
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=blackhole
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole
 master-bin.000001	#	Table_map	1	#	test.t2
 master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int
 master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b
 drop table t1,t2,t3;
+reset master;
+create table t1 (a int) engine=blackhole;
+set autocommit=0;
+start transaction;
+insert into t1 values(1);
+commit;
+start transaction;
+insert into t1 values(2);
+rollback;
+set autocommit=1;
+show binlog events;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=blackhole
+master-bin.000001	#	Query	1	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	1	#	test.t1
+master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Query	1	#	use `test`; COMMIT

--- 1.2/mysql-test/r/binlog_row_mix_innodb_myisam.result	2005-10-27 20:57:43 +02:00
+++ 1.3/mysql-test/r/binlog_row_mix_innodb_myisam.result	2005-12-14 16:45:00 +01:00
@@ -13,7 +13,7 @@
 master-bin.000001	207	Write_rows	1	#	
 master-bin.000001	239	Table_map	1	#	test.t2
 master-bin.000001	276	Write_rows	1	#	
-master-bin.000001	308	Xid	1	#	COMMIT /* xid=2183 */
+master-bin.000001	308	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -54,7 +54,7 @@
 master-bin.000001	393	Table_map	1	#	test.t2
 master-bin.000001	430	Write_rows	1	#	
 master-bin.000001	467	Query	1	#	use `test`; rollback to savepoint my_savepoint
-master-bin.000001	564	Xid	1	#	COMMIT /* xid=2200 */
+master-bin.000001	564	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -85,7 +85,7 @@
 master-bin.000001	467	Query	1	#	use `test`; rollback to savepoint my_savepoint
 master-bin.000001	564	Table_map	1	#	test.t1
 master-bin.000001	601	Write_rows	1	#	
-master-bin.000001	633	Xid	1	#	COMMIT /* xid=2212 */
+master-bin.000001	633	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -115,7 +115,7 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Table_map	1	#	test.t1
 master-bin.000001	139	Write_rows	1	#	
-master-bin.000001	171	Xid	1	#	COMMIT /* xid=2235 */
+master-bin.000001	171	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	198	Table_map	1	#	test.t2
 master-bin.000001	235	Write_rows	1	#	
 delete from t1;
@@ -128,7 +128,7 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Table_map	1	#	test.t1
 master-bin.000001	139	Write_rows	1	#	
-master-bin.000001	171	Xid	1	#	COMMIT /* xid=2241 */
+master-bin.000001	171	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	198	Table_map	1	#	test.t2
 master-bin.000001	235	Write_rows	1	#	
 insert into t1 values(11);
@@ -137,13 +137,13 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	102	Table_map	1	#	test.t1
 master-bin.000001	139	Write_rows	1	#	
-master-bin.000001	171	Xid	1	#	COMMIT /* xid=2241 */
+master-bin.000001	171	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	198	Table_map	1	#	test.t2
 master-bin.000001	235	Write_rows	1	#	
 master-bin.000001	267	Query	1	#	use `test`; BEGIN
 master-bin.000001	335	Table_map	1	#	test.t1
 master-bin.000001	372	Write_rows	1	#	
-master-bin.000001	404	Xid	1	#	COMMIT /* xid=2243 */
+master-bin.000001	404	Xid	1	#	COMMIT /* xid= */
 alter table t2 engine=INNODB;
 delete from t1;
 delete from t2;
@@ -159,7 +159,7 @@
 master-bin.000001	207	Write_rows	1	#	
 master-bin.000001	239	Table_map	1	#	test.t2
 master-bin.000001	276	Write_rows	1	#	
-master-bin.000001	308	Xid	1	#	COMMIT /* xid=2253 */
+master-bin.000001	308	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -184,7 +184,7 @@
 master-bin.000001	102	Query	1	#	use `test`; BEGIN
 master-bin.000001	170	Table_map	1	#	test.t1
 master-bin.000001	207	Write_rows	1	#	
-master-bin.000001	239	Xid	1	#	COMMIT /* xid=2269 */
+master-bin.000001	239	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 reset master;
@@ -207,7 +207,7 @@
 master-bin.000001	207	Write_rows	1	#	
 master-bin.000001	239	Table_map	1	#	test.t1
 master-bin.000001	276	Write_rows	1	#	
-master-bin.000001	308	Xid	1	#	COMMIT /* xid=2280 */
+master-bin.000001	308	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
 alter table t2 type=MyISAM;
@@ -230,3 +230,53 @@
 (@after-@before) >= 2
 1
 drop table t1,t2;
+commit;
+begin;
+create temporary table ti (a int) engine=innodb;
+rollback;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+insert into ti values(1);
+set autocommit=0;
+create temporary table t1 (a int) engine=myisam;
+commit;
+insert t1 values (1);
+rollback;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+create table t0 (n int);
+insert t0 select * from t1;
+set autocommit=1;
+insert into t0 select GET_LOCK("lock1",null);
+set autocommit=0;
+create table t2 (n int) engine=innodb;
+insert into t2 values (3);
+select get_lock("lock1",60);
+get_lock("lock1",60)
+1
+show binlog events from 102;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	102	Query	1	#	use `test`; BEGIN
+master-bin.000001	170	Table_map	1	#	test.t1
+master-bin.000001	207	Write_rows	1	#	
+master-bin.000001	239	Table_map	1	#	test.t1
+master-bin.000001	276	Write_rows	1	#	
+master-bin.000001	308	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	335	Table_map	1	#	test.t1
+master-bin.000001	372	Delete_rows	1	#	
+master-bin.000001	409	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	436	Query	1	#	use `test`; alter table t2 type=MyISAM
+master-bin.000001	525	Table_map	1	#	test.t1
+master-bin.000001	562	Write_rows	1	#	
+master-bin.000001	594	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	621	Table_map	1	#	test.t2
+master-bin.000001	658	Write_rows	1	#	
+master-bin.000001	690	Query	1	#	use `test`; drop table t1,t2
+master-bin.000001	769	Query	1	#	use `test`; create table t0 (n int)
+master-bin.000001	855	Table_map	1	#	test.t0
+master-bin.000001	892	Write_rows	1	#	
+master-bin.000001	924	Table_map	1	#	test.t0
+master-bin.000001	961	Write_rows	1	#	
+master-bin.000001	993	Query	1	#	use `test`; create table t2 (n int) engine=innodb
+do release_lock("lock1");
+drop table t0,t2;

--- 1.6/mysql-test/t/rpl_LD_INFILE.test	2005-08-31 05:29:03 +02:00
+++ 1.7/mysql-test/t/rpl_LD_INFILE.test	2005-12-14 16:45:01 +01:00
@@ -6,8 +6,6 @@
 #############################################################################
 
 # Includes
-#-- source include/have_binlog_format_row.inc
-# Should work for both stm and row
 -- source include/master-slave.inc
 
 # Begin clean up test section

--- 1.6/mysql-test/t/rpl_loadfile.test	2005-08-31 05:29:59 +02:00
+++ 1.7/mysql-test/t/rpl_loadfile.test	2005-12-14 16:45:01 +01:00
@@ -6,8 +6,6 @@
 #############################################################################
 
 # Includes
-#-- source include/have_binlog_format_row.inc
-# Should work for both stm and row
 -- source include/master-slave.inc
 
 

--- 1.8/mysql-test/t/rpl_sp004.test	2005-10-04 18:32:14 +02:00
+++ 1.9/mysql-test/t/rpl_sp004.test	2005-12-14 16:45:01 +01:00
@@ -8,9 +8,6 @@
 
 
 # Includes
-#-- source include/have_binlog_format_row.inc
-# Should work on both stm and row
-#-- source include/have_innodb.inc
 -- source include/master-slave.inc
 
 

--- 1.3/mysql-test/t/rpl_bit.test	2005-09-19 23:24:16 +02:00
+++ 1.4/mysql-test/t/rpl_bit.test	2005-12-14 16:45:01 +01:00
@@ -5,9 +5,6 @@
 # Test: To test the replication of the bit field                            #
 #############################################################################
 
-# Not running on RBR currently due to 13152
-# Includes
-#--source include/have_binlog_format_statement.inc
 -- source include/master-slave.inc
 
 

--- 1.2/mysql-test/t/rpl_bit_npk.test	2005-09-23 13:34:40 +02:00
+++ 1.3/mysql-test/t/rpl_bit_npk.test	2005-12-14 16:45:01 +01:00
@@ -5,9 +5,6 @@
 # Test: To test the replication of the bit field                            #
 #############################################################################
 
-# Not running on RBR currently due to 13152
-# Includes
-#--source include/have_binlog_format_statement.inc
 -- source include/master-slave.inc
 
 

--- 1.3/mysql-test/t/rpl_temporary.test	2005-08-31 06:07:06 +02:00
+++ 1.4/mysql-test/t/rpl_temporary.test	2005-12-14 16:45:01 +01:00
@@ -1,7 +1,3 @@
-# Requires statement logging
-# Should not longer require sbr or rbr formats
-#-- source include/have_binlog_format_row.inc
-
 -- source include/master-slave.inc
 
 # Clean up old slave's binlogs.

--- 1.43/mysql-test/mysql-test-run.pl	2005-12-13 16:10:47 +01:00
+++ 1.44/mysql-test/mysql-test-run.pl	2005-12-14 16:45:00 +01:00
@@ -2041,6 +2041,7 @@
   mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);
   mtr_add_arg($args, "%s--core", $prefix);
   mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);
+  mtr_add_arg($args, "%s--loose-binlog-no-xid", $prefix);
   mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);
   mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
   mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
@@ -2164,6 +2165,7 @@
   mtr_add_arg($args, "%s--sort_buffer=256K", $prefix);
   mtr_add_arg($args, "%s--max_heap_table_size=1M", $prefix);
   mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);
+  mtr_add_arg($args, "%s--loose-binlog-no-xid", $prefix);
 
   if ( $opt_ssl_supported )
   {

--- 1.18/mysql-test/t/disabled.def	2005-12-13 16:10:48 +01:00
+++ 1.19/mysql-test/t/disabled.def	2005-12-14 16:45:01 +01:00
@@ -19,4 +19,4 @@
 func_math       : Bug #15448
 group_min_max   : Bug #15448 
 mysqlslap       : Bug #15483
-innodb_concurrent: Results are not deterministic
+innodb_concurrent: Results are not deterministic, Elliot will fix (BUG#3300)

--- 1.3/config/ac-macros/replication.m4	2005-09-09 12:55:48 +02:00
+++ 1.4/config/ac-macros/replication.m4	2005-12-14 16:44:59 +01:00
@@ -1,4 +1,4 @@
-dnl This file contain configuration parameters for replication.
+dnl This file contains configuration parameters for replication.
 
 dnl ---------------------------------------------------------------------------
 dnl Macro: MYSQL_CHECK_REPLICATION
@@ -10,7 +10,7 @@
               AC_HELP_STRING([--with-row-based-replication],
                              [Include row-based replication]),
               [row_based="$withval"],
-              [row_based=no])
+              [row_based=yes])
   AC_MSG_CHECKING([for row-based replication])
 
   case "$row_based" in
@@ -24,6 +24,10 @@
     [have_row_based=no]
     ;;
   esac
+# This AM_CONDITIONAL is not needed for the push into 5.1
+# as it only serves for a portion of mysql-test-run.sh, which
+# portion will not be pushed into 5.1 (it's a portion to do
+# the testsuite with RBR by default)
   AM_CONDITIONAL([HAVE_ROW_BASED_REPLICATION], [ test "$have_row_based" = "yes" ])
 ])
 dnl ---------------------------------------------------------------------------

--- 1.4/mysql-test/extra/binlog_tests/innodb_stat.test	2005-10-27 20:56:58 +02:00
+++ 1.5/mysql-test/extra/binlog_tests/innodb_stat.test	2005-12-14 16:45:00 +01:00
@@ -1,5 +1,4 @@
 -- source include/have_innodb.inc
-#-- source include/have_binlog_format_statement.inc
 
 #
 # Let us test binlog_cache_use and binlog_cache_disk_use status vars.

--- 1.6/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2005-10-20 18:22:44 +02:00
+++ 1.7/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2005-12-14 16:45:00 +01:00
@@ -1,8 +1,5 @@
-
 # Check the replication of the FOREIGN_KEY_CHECKS variable.
 
-#-- source include/have_binlog_format_row.inc
-# Should work for both rbr and sbr
 -- source include/master-slave.inc
 
 eval CREATE TABLE t1 (a INT AUTO_INCREMENT KEY) ENGINE=$engine_type;

--- 1.3/mysql-test/t/rpl_loaddata2.test	2005-08-26 01:39:39 +02:00
+++ 1.4/mysql-test/t/rpl_loaddata2.test	2005-12-14 16:45:01 +01:00
@@ -1,5 +1,3 @@
-#--source include/have_binlog_format_row.inc
-# Should work for both SBR and RBR
 --source include/master-slave.inc
 
 CREATE TABLE t1 (word CHAR(20) NOT NULL);

--- 1.5/sql/rpl_tblmap.cc	2005-09-09 00:13:57 +02:00
+++ 1.6/sql/rpl_tblmap.cc	2005-12-14 16:45:01 +01:00
@@ -20,7 +20,7 @@
 
 #include "rpl_tblmap.h"
 
-#define MAYBE_TABLE_NAME(T) ((T) ? (T)->s->table_name : "<>")
+#define MAYBE_TABLE_NAME(T) ((T) ? (T)->s->table_name.str : "<>")
 #define TABLE_ID_HASH_SIZE 32
 #define TABLE_ID_CHUNK 256
 

--- 1.4/mysql-test/t/rpl_000015.test	2005-08-26 17:08:09 +02:00
+++ 1.5/mysql-test/t/rpl_000015.test	2005-12-14 16:45:01 +01:00
@@ -1,7 +1,3 @@
-# Requires statement logging
-#-- source include/have_binlog_format_row.inc
-#Should work for both rbr and sbr
-
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
 connection master;

--- 1.5/mysql-test/t/rpl_flushlog_loop.test	2005-08-26 17:06:21 +02:00
+++ 1.6/mysql-test/t/rpl_flushlog_loop.test	2005-12-14 16:45:01 +01:00
@@ -1,7 +1,5 @@
 # Testing if "flush logs" command bouncing resulting in logs created in a loop 
 # in case of bi-directional replication
-#-- source include/have_binlog_format_row.inc
-# Should work on both rbr and sbr
 -- source include/master-slave.inc
 
 # This test is dependent on the actual events written to the binary

--- 1.4/mysql-test/t/rpl_loaddata_s.test	2005-08-26 18:02:05 +02:00
+++ 1.5/mysql-test/t/rpl_loaddata_s.test	2005-12-14 16:45:01 +01:00
@@ -2,8 +2,6 @@
 # replicated LOAD DATA INFILE correctly when it has binlog_*_db rules.
 # This is for BUG#1100 (LOAD DATA INFILE was half-logged).
 
-#-- source include/have_binlog_format_row.inc
-#Should work for both rbr and sbr
 -- source include/master-slave.inc
 
 connection slave;

--- 1.27/mysql-test/t/rpl_replicate_do.test	2005-11-17 21:32:53 +01:00
+++ 1.28/mysql-test/t/rpl_replicate_do.test	2005-12-14 16:45:01 +01:00
@@ -1,8 +1,5 @@
 # This test assumes we are ignoring updates on table t2, but doing
 # updates on t1
-# Currently casues slave to produce wrong result bug#12421
-# TODO: Remove statement include once bug 12421 is patched
-#--source include/have_binlog_format_statement.inc
 source include/master-slave.inc;
 --disable_warnings
 drop table if exists t11;

--- 1.33/mysql-test/t/user_var.test	2005-11-04 10:43:45 +01:00
+++ 1.34/mysql-test/t/user_var.test	2005-12-14 16:45:01 +01:00
@@ -1,10 +1,3 @@
-# Requires statement logging
-#-- source include/have_binlog_format_statement.inc
-# This test was failing due to error format change
-# - old = ERROR 42S22: Unknown column 'foo' in 'order clause'
-# - new = ERROR 42S22: Unknown column 'foo' in 'field list'
-# Now passes both row and statement based
-
 # Initialise
 --disable_warnings
 drop table if exists t1,t2;

--- 1.8/mysql-test/r/binlog_stm_binlog.result	2005-09-20 20:17:41 +02:00
+++ 1.9/mysql-test/r/binlog_stm_binlog.result	2005-12-14 16:45:00 +01:00
@@ -17,7 +17,7 @@
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
 master-bin.000001	#	Query	1	#	use `test`; insert t2 values (5)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=12 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
 drop table t1,t2;
 reset master;
 create table t1 (n int) engine=innodb;
@@ -128,7 +128,7 @@
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(3 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(2 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1 + 4)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=19 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002' from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

--- 1.7/mysql-test/extra/binlog_tests/binlog.test	2005-09-19 17:13:11 +02:00
+++ 1.8/mysql-test/extra/binlog_tests/binlog.test	2005-12-14 16:45:00 +01:00
@@ -1,9 +1,10 @@
 #
 # misc binlogging tests that do not require a slave running
 #
-#-- source include/have_binlog_format_statement.inc
+
 -- source include/have_bdb.inc
 -- source include/have_innodb.inc
+-- source include/have_debug.inc
 
 --disable_warnings
 drop table if exists t1, t2;
@@ -19,7 +20,6 @@
 insert t2 values (5);
 commit;
 # first COMMIT must be Query_log_event, second - Xid_log_event
---replace_result "xid=18" "xid=11"
 --replace_column 2 # 5 #
 show binlog events from 102;
 drop table t1,t2;
@@ -41,7 +41,6 @@
 --enable_query_log
 commit;
 drop table t1;
---replace_result "xid=29" "xid=18"
 --replace_column 2 # 5 #
 show binlog events in 'master-bin.000001' from 102;
 --replace_column 2 # 5 #

--- 1.11/mysql-test/extra/binlog_tests/ctype_cp932.test	2005-10-26 19:12:17 +02:00
+++ 1.12/mysql-test/extra/binlog_tests/ctype_cp932.test	2005-12-14 16:45:00 +01:00
@@ -1,5 +1,3 @@
-# show binlog events used
-#-- source include/have_binlog_format_statement.inc
 -- source include/have_cp932.inc
 
 --character_set cp932

--- 1.55/BUILD/SETUP.sh	2005-12-13 16:10:47 +01:00
+++ 1.56/BUILD/SETUP.sh	2005-12-14 16:44:59 +01:00
@@ -55,12 +55,12 @@
 global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"
 #debug_extra_warnings="-Wuninitialized"
 c_warnings="$global_warnings -Wunused"
-cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder"
 base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"
 base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"
 max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY"
-max_configs="$base_max_configs --with-embedded-server --with-row-based-replication"
-max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server --with-row-based-replication"
+max_configs="$base_max_configs --with-embedded-server"
+max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"
 
 path=`dirname $0`
 . "$path/check-cpu"
Thread
bk commit into 5.1 tree (guilhem:1.1961)guilhem14 Dec