Commit 047eced3 authored by Andrei Elkin's avatar Andrei Elkin
Browse files

merge 5.1-rpl repository -> 5.1-rpl local

parents cf99c5ba de7be3a4

mysql-test/extra/rpl_tests/rpl_flsh_tbls.test

+12 −7
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
# Test of FLUSH NO_WRITE_TO_BINLOG by the way.

#





-- source include/master-slave.inc

source include/master-slave.inc;



let $SERVER_VERSION=`select version()`;
@@ -34,26 +33,32 @@ flush tables; 
--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;

sync_with_master;



sync_slave_with_master;

# Check that the slave is not confused.

select * from t3;

# Note that all this confusion may cause warnings 'table xx is open on rename'

# in the .err files; these are not fatal and are not reported by mysql-test-run.



stop slave;

source include/wait_for_slave_to_stop.inc;



connection master;

drop table t1;



connection slave;

flush tables with read lock;

start slave;

sleep 1;

source include/wait_for_slave_to_start.inc;

--error 1192

stop slave;



# Cleanup

unlock tables;



connection master;

drop table t3, t4, t5;



sync_slave_with_master;



# End of 4.1 tests

mysql-test/include/mtr_warnings.sql

+10 −5
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ INSERT INTO global_suppressions VALUES 
--

CREATE DEFINER=root@localhost PROCEDURE check_warnings(OUT result INT)

BEGIN

  DECLARE `text` text charset utf8;

  DECLARE `pos` bigint unsigned;



  -- Don't write these queries to binlog

  SET SQL_LOG_BIN=0;
@@ -234,15 +236,17 @@ BEGIN 
      WHERE variable_name='LOG_ERROR';



  SET @@session.max_allowed_packet= 1024*1024*1024;

  SET @text= load_file(@log_error);

  -- select @text;

  SET text= load_file(@log_error);

  -- select text;



  WHILE LOCATE('\n', @text) DO

  SET pos= LOCATE('\n', text);

  WHILE pos DO

    INSERT error_log (line)

      VALUES (

       SUBSTR(@text, 1, LOCATE('\n', @text)-1)

       SUBSTR(text, 1, pos-1)

      );

    SET @text= SUBSTR(@text FROM LOCATE('\n', @text)+1);

    SET text= SUBSTR(text FROM pos+1);

    SET pos= LOCATE('\n', text);

  END WHILE;



  -- select * from error_log;
@@ -287,6 +291,7 @@ BEGIN 


  -- Cleanup for next test

  TRUNCATE test_suppressions;

  DROP TABLE error_log, suspect_lines;



END||

mysql-test/include/rpl_multi_engine.inc

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id; 
sync_slave_with_master;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

connection master;

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

sync_slave_with_master;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

mysql-test/include/wait_for_slave_sql_error.inc

+17 −3
Original line number Diff line number Diff line
@@ -7,15 +7,29 @@ 
#

# source include/wait_for_slave_sql_error.inc;

#

# Parameters to this macro are $slave_timeout and

# $slave_keep_connection. See wait_for_slave_param.inc for

# descriptions.

# Parameters:

#

# $slave_sql_errno

#   Number of expected SQL error. If it skipped then any error

#   will pass.

# 

# $slave_timeout and

#   See wait_for_slave_param.inc for descriptions.

# 

# $slave_keep_connection. 

#   See wait_for_slave_param.inc for descriptions.



let $old_slave_param_comparison= $slave_param_comparison;



let $slave_param= Last_SQL_Errno;

let $slave_param_comparison= !=;

let $slave_param_value= 0;



if ($slave_sql_errno) {

  let $slave_param_comparison= =;

  let $slave_param_value= $slave_sql_errno;

}



let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread;

source include/wait_for_slave_param.inc;

let $slave_error_message= ;

mysql-test/include/wait_until_disconnected.inc

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
--disable_result_log

--disable_query_log

let $counter= 500;

let $mysql_errno= 9999;

let $mysql_errno= 0;

while (!$mysql_errno)

{

  --error 0,1053,2002,2006