Commit 02d5adb6 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal:/home/bk/mysql-5.1-new 

into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new


sql/sql_yacc.yy:
  Auto merged
parents de0e4a9a bb0a990a

mysql-test/extra/binlog_tests/binlog.test

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +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: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

drop table t1,t2;
@@ -44,8 +44,8 @@ while ($1) 
commit;

drop table t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events in 'master-bin.000001' from 102;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events in 'master-bin.000002' from 102;

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+13 −13
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ insert into t2 select * from t1; 
commit;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



delete from t1;
@@ -44,7 +44,7 @@ insert into t2 select * from t1; 
rollback;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



delete from t1;
@@ -60,7 +60,7 @@ rollback to savepoint my_savepoint; 
commit;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



delete from t1;
@@ -78,7 +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: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



# and when ROLLBACK is not explicit?
@@ -100,7 +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: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



# and when not in a transact1on?
@@ -112,7 +112,7 @@ insert into t1 values(9); 
insert into t2 select * from t1;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



# Check that when the query updat1ng the MyISAM table is the first in the
@@ -125,13 +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: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

insert into t1 values(11);

commit;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;
@@ -150,7 +150,7 @@ insert into t2 select * from t1; 
commit;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



delete from t1;
@@ -163,7 +163,7 @@ insert into t2 select * from t1; 
rollback;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



delete from t1;
@@ -179,7 +179,7 @@ rollback to savepoint my_savepoint; 
commit;



--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



delete from t1;
@@ -197,7 +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: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



# Test for BUG#5714, where a MyISAM update in the transaction used to
@@ -258,7 +258,7 @@ disconnect con2; 
connection con3;

select get_lock("lock1",60);

--replace_column 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

do release_lock("lock1");

drop table t0,t2;

mysql-test/mysql-test-run.pl

+0 −2
Original line number Diff line number Diff line
@@ -2597,7 +2597,6 @@ sub mysqld_arguments ($$$$$$) { 
  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-show-xid=0", $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);
@@ -2743,7 +2742,6 @@ sub mysqld_arguments ($$$$$$) { 
  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-show-xid=0", $prefix);



  if ( $opt_ssl_supported )

  {

mysql-test/mysql-test-run.sh

+0 −3
Original line number Diff line number Diff line
@@ -1345,7 +1345,6 @@ start_master() 
          --innodb_data_file_path=ibdata1:128M:autoextend \

	  --open-files-limit=1024 \

          --log-bin-trust-function-creators \

          --loose-binlog-show-xid=0 \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $MASTER_MYSQLD_BINLOG_OPT \
@@ -1369,7 +1368,6 @@ start_master() 
          --language=$LANGUAGE \

          --innodb_data_file_path=ibdata1:128M:autoextend \

          --log-bin-trust-function-creators \

          --loose-binlog-show-xid=0 \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $MASTER_MYSQLD_BINLOG_OPT \
@@ -1542,7 +1540,6 @@ start_slave() 
          --master-retry-count=10 \

          -O slave_net_timeout=10 \

          --log-bin-trust-function-creators \

          --loose-binlog-show-xid=0 \

           $SMALL_SERVER \

           $SLAVE_MYSQLD_BINLOG_OPT \

           $EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT \

sql/log_event.cc

+1 −13
Original line number Diff line number Diff line
@@ -3481,23 +3481,11 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli) 
  Xid_log_event methods

**************************************************************************/



#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)

/*

  This static class member could be removed when mysqltest is made to support

  a --replace-regex command: then tests which have XIDs in their output can

  use this command to suppress non-deterministic XID values.

*/

my_bool Xid_log_event::show_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=");

#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)

  if (show_xid)

#endif

  pos= longlong10_to_str(xid, pos, 10);

  pos= strmov(pos, " */");

  protocol->store(buf, (uint) (pos-buf), &my_charset_bin);