Commit 24c005cf authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/bk/b17400-mysql-5.1-new
parents cbdc730a d77cfdc7

mysql-test/extra/rpl_tests/rpl_sv_relay_space.test

+12 −10
Original line number Diff line number Diff line
@@ -14,20 +14,22 @@ source include/master-slave.inc; 
#

SHOW VARIABLES LIKE 'relay_log_space_limit';



# Matz says: I have no idea what this is supposed to test, but it has

# potential for generating different results with some storage engines

# that process rows in an order not dependent on the insertion order.

# For instance, I would assume that distributed storage engines (like

# NDB) could process rows based on locality.



eval CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=$engine_type;

INSERT INTO t1 SET name='Andy', age=31;

INSERT t1 SET name='Jacob', age=2;

INSERT into t1 SET name='Caleb', age=1;

INSERT INTO t1 SET name='Jacob', age=2;

INSERT INTO t1 SET name='Caleb', age=1;

ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;

SELECT * FROM t1 ORDER BY id;

save_master_pos;

connection slave;

sync_with_master;

sync_slave_with_master;

SELECT * FROM t1 ORDER BY id;

connection master;

drop table t1;

save_master_pos;

connection slave;

sync_with_master;

DROP TABLE t1;

sync_slave_with_master;



# End of 4.1 tests

mysql-test/include/rpl_multi_engine3.inc

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412; 


# Must give injector thread a little time to get update

# into the binlog other wise we will miss the update.

sleep 3;

sleep 10;



sync_slave_with_master;

--echo --- Check Update on slave ---

mysql-test/r/rpl_ndb_relay_space.result

+4 −4
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ Variable_name Value 
relay_log_space_limit	0

CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=NDB;

INSERT INTO t1 SET name='Andy', age=31;

INSERT t1 SET name='Jacob', age=2;

INSERT into t1 SET name='Caleb', age=1;

INSERT INTO t1 SET name='Jacob', age=2;

INSERT INTO t1 SET name='Caleb', age=1;

ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;

SELECT * FROM t1 ORDER BY id;

name	age	id
@@ -22,4 +22,4 @@ name age id 
Andy	31	00000001

Caleb	1	00000002

Jacob	2	00000003

drop table t1;
 
DROP TABLE t1;

mysql-test/r/rpl_relay_space_innodb.result

+4 −4
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ Variable_name Value 
relay_log_space_limit	0

CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=InnoDB;

INSERT INTO t1 SET name='Andy', age=31;

INSERT t1 SET name='Jacob', age=2;

INSERT into t1 SET name='Caleb', age=1;

INSERT INTO t1 SET name='Jacob', age=2;

INSERT INTO t1 SET name='Caleb', age=1;

ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;

SELECT * FROM t1 ORDER BY id;

name	age	id
@@ -22,4 +22,4 @@ name age id 
Andy	31	00000001

Jacob	2	00000002

Caleb	1	00000003

drop table t1;
 
DROP TABLE t1;

mysql-test/r/rpl_relay_space_myisam.result

+4 −4
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ Variable_name Value 
relay_log_space_limit	0

CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=MyISAM;

INSERT INTO t1 SET name='Andy', age=31;

INSERT t1 SET name='Jacob', age=2;

INSERT into t1 SET name='Caleb', age=1;

INSERT INTO t1 SET name='Jacob', age=2;

INSERT INTO t1 SET name='Caleb', age=1;

ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;

SELECT * FROM t1 ORDER BY id;

name	age	id
@@ -22,4 +22,4 @@ name age id 
Andy	31	00000001

Jacob	2	00000002

Caleb	1	00000003

drop table t1;
 
DROP TABLE t1;