Commit 9933c3bd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Auto merged
mysql-test/r/rpl_ddl.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/rpl_ndb_charset.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
sql/handler.cc:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
parents ed849efc 684bda9a

mysql-test/extra/rpl_tests/rpl_ddl.test

+3 −7
Original line number Diff line number Diff line
@@ -228,15 +228,11 @@ let $my_master_commit= true; 
let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SELECT * FROM mysqltest1.t7;

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

--echo -------- switch to slave --------

sync_slave_with_master;

SELECT * FROM mysqltest1.t7;

--echo -------- switch to master -------

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



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

# Cases with LOCK/UNLOCK

mysql-test/extra/rpl_tests/rpl_truncate.test

0 → 100644
+36 −0
Original line number Diff line number Diff line 
#

# Copyright 2006 MySQL. All rights reserved.

#

# Test to check for the different version of truncating a table.

# The statements are "TRUNCATE tbl" and "DELETE FROM tbl". We check

# the behaviour of each possible value for BINLOG_FORMAT.

#

# Author(s): Mats Kindahl



--source include/have_row_based.inc

--source include/master-slave.inc



let $format = STATEMENT;

let $stmt   = TRUNCATE TABLE;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = MIXED;

let $stmt   = TRUNCATE TABLE;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = ROW;

let $stmt   = TRUNCATE TABLE;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = STATEMENT;

let $stmt   = DELETE FROM;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = MIXED;

let $stmt   = DELETE FROM;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = ROW;

let $stmt   = DELETE FROM;

--source extra/rpl_tests/rpl_truncate_helper.inc

mysql-test/extra/rpl_tests/rpl_truncate_helper.inc

0 → 100644
+41 −0
Original line number Diff line number Diff line 


--disable_query_log

--disable_warnings

connection slave;

STOP SLAVE;

connection master;

DROP TABLE IF EXISTS t1;

RESET MASTER;

connection slave;

DROP TABLE IF EXISTS t1;

RESET SLAVE;

START SLAVE;

--enable_warnings

--enable_query_log



--echo **** On Master ****

connection master;

eval SET SESSION BINLOG_FORMAT=$format;

eval SET GLOBAL  BINLOG_FORMAT=$format;



eval CREATE TABLE t1 (a INT, b LONG) ENGINE=$engine;

INSERT INTO t1 VALUES (1,1), (2,2);

SELECT * FROM t1;

--echo **** On Slave ****

sync_slave_with_master;

INSERT INTO t1 VALUE (3,3);

SELECT * FROM t1;

--echo **** On Master ****

connection master;

eval $stmt t1;

SELECT * FROM t1;

--echo **** On Slave ****

sync_slave_with_master;

# Should be empty

SELECT * FROM t1;

--echo **** On Master ****

connection master;

DROP TABLE t1;

--replace_result $SERVER_VERSION SERVER_VERSION

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

SHOW BINLOG EVENTS;

mysql-test/include/master-slave-reset.inc

0 → 100644
+22 −0
Original line number Diff line number Diff line 
connection slave;

#we expect STOP SLAVE to produce a warning as the slave is stopped

#(the server was started with skip-slave-start)

--disable_warnings

stop slave;

--wait_for_slave_to_stop

--enable_warnings

connection master;

--disable_warnings

--disable_query_log

use test;

--enable_query_log

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

reset master;

connection slave;

reset slave;

# Clean up old test tables

--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

start slave;

mysql-test/include/master-slave.inc

+2 −22
Original line number Diff line number Diff line
@@ -2,28 +2,8 @@ connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); 
connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);

connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);

connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);

connection slave;

#we expect STOP SLAVE to produce a warning as the slave is stopped

#(the server was started with skip-slave-start)

--disable_warnings

stop slave;

--enable_warnings

--require r/slave-stopped.result 

show status like 'Slave_running';

connection master;

--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

reset master;

connection slave;

reset slave;

# Clean up old test tables

--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

start slave;

--require r/slave-running.result

show status like 'Slave_running';



-- source include/master-slave-reset.inc



# Set the default connection to 'master'

connection master;