Merge mysql.com:/home/bkroot/mysql-5.1-new

into  mysql.com:/home/bk/w3023-mysql-5.1-new


configure.in:
  Auto merged
BitKeeper/deleted/.del-sp_notembedded.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged

12 files changed, 36 insertions, 8 deletions

diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test
index e569e15e519..ff43debf967 100644
--- a/mysql-test/extra/binlog_tests/binlog.test
+++ b/mysql-test/extra/binlog_tests/binlog.test
@@ -22,6 +22,7 @@ insert t2 values (5);
 commit;
 # first COMMIT must be Query_log_event, second - Xid_log_event
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 drop table t1,t2;
 
@@ -43,6 +44,8 @@ while ($1)
 commit;
 drop table t1;
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events in 'master-bin.000001' from 102;
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events in 'master-bin.000002' from 102;
diff --git a/mysql-test/extra/binlog_tests/blackhole.test b/mysql-test/extra/binlog_tests/blackhole.test
index bd77286a9fe..71aec90e9a0 100644
--- a/mysql-test/extra/binlog_tests/blackhole.test
+++ b/mysql-test/extra/binlog_tests/blackhole.test
@@ -123,6 +123,7 @@ select * from t3;
 let $VERSION=`select version()`;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
 
 drop table t1,t2,t3;
@@ -144,4 +145,5 @@ rollback;
 set autocommit=1;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
diff --git a/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test b/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test
index a17f8f827a6..5e93d6e126e 100644
--- a/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test
+++ b/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test
@@ -27,6 +27,7 @@ SET @var1= x'8300';
 # exercise this code from mysql-test-run.
 EXECUTE stmt1 USING @var1;
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS FROM 102;
 SELECT HEX(f1) FROM t1;
 DROP table t1;
diff --git a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test b/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
index 940310e4499..afe594b8d36 100644
--- a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
+++ b/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
@@ -9,6 +9,7 @@ create table t2 (c char(30)) charset=ucs2;
 set @v=convert('abc' using ucs2);
 reset master;
 insert into t2 values (@v);
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
diff --git a/mysql-test/extra/binlog_tests/drop_temp_table.test b/mysql-test/extra/binlog_tests/drop_temp_table.test
index bc06de4096c..9c8647395bf 100644
--- a/mysql-test/extra/binlog_tests/drop_temp_table.test
+++ b/mysql-test/extra/binlog_tests/drop_temp_table.test
@@ -25,6 +25,7 @@ select get_lock("a",10);
 let $VERSION=`select version()`;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
 drop database `drop-temp+table-test`;
 
diff --git a/mysql-test/extra/binlog_tests/insert_select-binlog.test b/mysql-test/extra/binlog_tests/insert_select-binlog.test
index d4041f86ab5..a01dae5934b 100644
--- a/mysql-test/extra/binlog_tests/insert_select-binlog.test
+++ b/mysql-test/extra/binlog_tests/insert_select-binlog.test
@@ -15,6 +15,7 @@ insert into t1 select * from t2;
 # verify the binlog :
 let $VERSION=`select version()`;
 --replace_result $VERSION VERSION
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
 select * from t1;
 drop table t1, t2;
@@ -29,6 +30,7 @@ create table t2(unique(a)) select a from t1;
 # The above should produce an error, *and* not appear in the binlog
 let $VERSION=`select version()`;
 --replace_result $VERSION VERSION
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
 drop table t1;
 
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
index 05d36b8b831..b75a326d5a8 100644
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@@ -30,6 +30,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 delete from t1;
@@ -43,6 +44,7 @@ insert into t2 select * from t1;
 rollback;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 delete from t1;
@@ -58,6 +60,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 delete from t1;
@@ -75,6 +78,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 # and when ROLLBACK is not explicit?
@@ -96,6 +100,7 @@ connection con2;
 # logging has been done, we use a user lock.
 select get_lock("a",10);
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 # and when not in a transact1on?
@@ -107,6 +112,7 @@ insert into t1 values(9);
 insert into t2 select * from t1;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 # Check that when the query updat1ng the MyISAM table is the first in the
@@ -119,11 +125,13 @@ insert into t1 values(10); # first make t1 non-empty
 begin;
 insert into t2 select * from t1;
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 insert into t1 values(11);
 commit;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 
@@ -142,6 +150,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 delete from t1;
@@ -154,6 +163,7 @@ insert into t2 select * from t1;
 rollback;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 delete from t1;
@@ -169,6 +179,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 delete from t1;
@@ -186,6 +197,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 
 # Test for BUG#5714, where a MyISAM update in the transaction used to
@@ -246,6 +258,7 @@ disconnect con2;
 connection con3;
 select get_lock("lock1",60);
 --replace_column 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 do release_lock("lock1");
 drop table t0,t2;
diff --git a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
index c5db667e29b..cfa943228fa 100644
--- a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
+++ b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
@@ -19,6 +19,7 @@ flush no_write_to_binlog tables;
 # Check that it's not in the binlog.
 --replace_result $SERVER_VERSION SERVER_VERSION
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 eval SHOW BINLOG EVENTS FROM $rename_event_pos ;
 # Check that the master is not confused.
 select * from t3;
@@ -27,6 +28,7 @@ flush tables;
 # Check that it's in the binlog.
 --replace_result $SERVER_VERSION SERVER_VERSION
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 eval SHOW BINLOG EVENTS FROM $rename_event_pos ;
 save_master_pos;
 connection slave;
diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test
index c2e0cc085c2..0c638281ecb 100644
--- a/mysql-test/extra/rpl_tests/rpl_log.test
+++ b/mysql-test/extra/rpl_tests/rpl_log.test
@@ -38,16 +38,16 @@ load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
 select count(*) from t1;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events;
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events from 102 limit 1;
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events from 102 limit 2;
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events from 102 limit 2,1;
 flush logs;
 
@@ -88,11 +88,11 @@ eval create table t2 (n int)ENGINE=$engine_type;
 insert into t2 values (1);
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events in 'master-bin.000002';
 show binary logs;
 save_master_pos;
@@ -102,11 +102,11 @@ sync_with_master;
 show binary logs;
 --replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events in 'slave-bin.000001' from 4;
 --replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
 --replace_column 2 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events in 'slave-bin.000002' from 4;
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 16 # 23 # 33 #
diff --git a/mysql-test/extra/rpl_tests/rpl_multi_query.test b/mysql-test/extra/rpl_tests/rpl_multi_query.test
index a0062bd04bf..30a83886a86 100644
--- a/mysql-test/extra/rpl_tests/rpl_multi_query.test
+++ b/mysql-test/extra/rpl_tests/rpl_multi_query.test
@@ -24,6 +24,7 @@ sync_slave_with_master;
 select * from mysqltest.t1;
 connection master;
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 drop database mysqltest;
 sync_slave_with_master;
diff --git a/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test b/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test
index 6069a2973ef..2059717b225 100644
--- a/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test
+++ b/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test
@@ -14,6 +14,7 @@ sync_slave_with_master;
 
 connection master;
 --replace_result $VERSION VERSION
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
 sync_slave_with_master;
 SELECT * FROM t1 ORDER BY a;
diff --git a/mysql-test/extra/rpl_tests/rpl_stm_charset.test b/mysql-test/extra/rpl_tests/rpl_stm_charset.test
index e5209a9b9ac..d29a82cfd31 100644
--- a/mysql-test/extra/rpl_tests/rpl_stm_charset.test
+++ b/mysql-test/extra/rpl_tests/rpl_stm_charset.test
@@ -110,6 +110,7 @@ connection master;
 drop database mysqltest2;
 drop database mysqltest3;
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events from 102;
 sync_slave_with_master;