Commit 37486843 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

Merge bk-internal:/home/bk/mysql-5.1-rpl 

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
parents 78392fbc f48aa05f

include/m_ctype.h

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ typedef struct charset_info_st 
  MY_COLLATION_HANDLER *coll;

  

} CHARSET_INFO;

#define ILLEGAL_CHARSET_INFO_NUMBER (~0U)





extern CHARSET_INFO my_charset_bin;

mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test

+26 −33
Original line number Diff line number Diff line
@@ -403,45 +403,38 @@ sync_slave_with_master; 
# added columns do not have default values#

# Expect: Proper error message            #

###########################################

# Commented out due to Bug #23907 Extra Slave Col is not 

# Bug#22234, Bug#23907 Extra Slave Col is not 

# erroring on extra col with no default values.

########################################################

#--echo *** Create t9 on slave  ***

#STOP SLAVE;

#RESET SLAVE;

#eval CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5),

#                      d TIMESTAMP,

#                      e INT DEFAULT '1')ENGINE=$engine_type;



#--echo *** Create t9 on Master ***

#connection master;

#eval CREATE TABLE t9 (a INT PRIMARY KEY, b BLOB, c CHAR(5)

#                       ) ENGINE=$engine_type;

#RESET MASTER;

STOP SLAVE;

RESET SLAVE;

eval CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5),

                      d TIMESTAMP,

                      e INT NOT NULL) ENGINE=$engine_type;



#--echo *** Start Slave ***

#connection slave;

#START SLAVE;

--echo *** Create t9 on Master ***

connection master;

eval CREATE TABLE t9 (a INT PRIMARY KEY, b BLOB, c CHAR(5)

                       ) ENGINE=$engine_type;

RESET MASTER;



#--echo *** Master Data Insert ***

#connection master;

#set @b1 = 'b1b1b1b1';

#set @b1 = concat(@b1,@b1);

#INSERT INTO t9 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');

--echo *** Start Slave ***

connection slave;

START SLAVE;



#--echo *************************************************

#--echo ** Currently giving wrong error see bug#22234 ***

#--echo *************************************************

#sync_slave_with_master;

#connection slave;

--echo *** Master Data Insert ***

connection master;

set @b1 = 'b1b1b1b1';

set @b1 = concat(@b1,@b1);

INSERT INTO t9 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');



#--echo *** Select from T9 ***

#--source include/wait_for_slave_sql_to_stop.inc

#--replace_result $MASTER_MYPORT MASTER_PORT

#--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 #

#--query_vertical SHOW SLAVE STATUS

#SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

#START SLAVE;

--source include/wait_for_slave_sql_to_stop.inc

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;



#--echo *** Drop t9  ***

#connection master;

mysql-test/extra/rpl_tests/rpl_loaddata.test

+0 −7
Original line number Diff line number Diff line
@@ -39,13 +39,6 @@ sync_with_master; 


select * from t1;

select * from t3;

# We want to be sure that LOAD DATA is in the slave's binlog.

# But we can't simply read this binlog, because as the slave has not been

# restarted for this test, the file_id is uncertain (would cause test

# failures). So instead, we test if the binlog looks long enough to

# contain LOAD DATA. Since 5.0.3 we assume that binlog of 1292 is ok.

# If LOAD DATA was not logged, the binlog would be shorter.

show master status;



connection master;

mysql-test/extra/rpl_tests/rpl_log.test

+1 −1
Original line number Diff line number Diff line
@@ -148,5 +148,5 @@ drop table t1; 


# End of 4.1 tests



sync_with_master;

sync_slave_with_master;

mysql-test/include/commit.inc

+9 −1
Original line number Diff line number Diff line
@@ -341,6 +341,14 @@ drop function if exists f1; 
drop procedure if exists p_verify_status_increment;

--enable_warnings



# Save binlog_format in a user variable. References to system

# variables are "unsafe", meaning they are written as rows instead of

# as statements to the binlog, if the loggging mode is 'mixed'.  But

# we don't want p_verify_status_increment to affect the logging mode.

# Hence, we save binlog_format in a user variable (which is not

# unsafe) and use that inside p_verify_status_increment.

set @binlog_format=@@global.binlog_format;



set sql_mode=no_engine_substitution;

create table t1 (a int unique); 

create table t2 (a int) engine=myisam;
@@ -367,7 +375,7 @@ begin 
     where variable_name='Handler_commit' or variable_name='Handler_prepare'

     order by variable_name;



  if @@global.binlog_format = 'ROW' then

  if @binlog_format = 'ROW' then

    set commit_inc= commit_inc_row;

    set prepare_inc= prepare_inc_row;

  else