mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	into dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge include/my_sys.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/rpl_row_create_table.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/rpl_row_create_table.test: Auto merged mysys/my_malloc.c: Auto merged server-tools/instance-manager/parse.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.h: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged mysys/safemalloc.c: Merge of mysql-5.1-new-rpl into mysql-5.1 sql/ha_federated.cc: d Merge of mysql-5.1-new-rpl into mysql-5.1 sql/set_var.cc: Merge of mysql-5.1-new-rpl with mysql-5.1 sql/slave.cc: Merge of mysql-5.1-new-rpl into mysql-5.1 sql/sql_class.h: Merge of mysql-5.1-new-rpl into mysql-5.1
		
			
				
	
	
		
			215 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			215 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
stop slave;
 | 
						|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 | 
						|
reset master;
 | 
						|
reset slave;
 | 
						|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 | 
						|
start slave;
 | 
						|
CREATE TABLE t1 (a INT, b INT);
 | 
						|
CREATE TABLE t2 (a INT, b INT) ENGINE=Merge;
 | 
						|
CREATE TABLE t3 (a INT, b INT) CHARSET=utf8;
 | 
						|
CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8;
 | 
						|
SHOW BINLOG EVENTS FROM 212;
 | 
						|
Log_name	#
 | 
						|
Pos	212
 | 
						|
Event_type	Query
 | 
						|
Server_id	#
 | 
						|
End_log_pos	#
 | 
						|
Info	use `test`; CREATE TABLE t1 (a INT, b INT)
 | 
						|
Log_name	#
 | 
						|
Pos	305
 | 
						|
Event_type	Query
 | 
						|
Server_id	#
 | 
						|
End_log_pos	#
 | 
						|
Info	use `test`; CREATE TABLE t2 (a INT, b INT) ENGINE=Merge
 | 
						|
Log_name	#
 | 
						|
Pos	411
 | 
						|
Event_type	Query
 | 
						|
Server_id	#
 | 
						|
End_log_pos	#
 | 
						|
Info	use `test`; CREATE TABLE t3 (a INT, b INT) CHARSET=utf8
 | 
						|
Log_name	#
 | 
						|
Pos	517
 | 
						|
Event_type	Query
 | 
						|
Server_id	#
 | 
						|
End_log_pos	#
 | 
						|
Info	use `test`; CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8
 | 
						|
**** On Master ****
 | 
						|
SHOW CREATE TABLE t1;
 | 
						|
Table	t1
 | 
						|
Create Table	CREATE TABLE `t1` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
 | 
						|
SHOW CREATE TABLE t2;
 | 
						|
Table	t2
 | 
						|
Create Table	CREATE TABLE `t2` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=()
 | 
						|
SHOW CREATE TABLE t3;
 | 
						|
Table	t3
 | 
						|
Create Table	CREATE TABLE `t3` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MyISAM DEFAULT CHARSET=utf8
 | 
						|
**** On Slave ****
 | 
						|
SHOW CREATE TABLE t1;
 | 
						|
Table	t1
 | 
						|
Create Table	CREATE TABLE `t1` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MEMORY DEFAULT CHARSET=latin1
 | 
						|
SHOW CREATE TABLE t2;
 | 
						|
Table	t2
 | 
						|
Create Table	CREATE TABLE `t2` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=()
 | 
						|
SHOW CREATE TABLE t3;
 | 
						|
Table	t3
 | 
						|
Create Table	CREATE TABLE `t3` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MEMORY DEFAULT CHARSET=utf8
 | 
						|
CREATE TABLE t5 (b INT, c INT) SELECT * FROM t3;
 | 
						|
CREATE TEMPORARY TABLE tt3 (a INT, b INT);
 | 
						|
INSERT INTO tt3 VALUES (1,2), (2,4), (3,6), (4,2), (5,10), (6,12);
 | 
						|
CREATE TABLE t6 (b INT, c INT) SELECT * FROM tt3;
 | 
						|
**** On Master ****
 | 
						|
SHOW CREATE TABLE t5;
 | 
						|
Table	t5
 | 
						|
Create Table	CREATE TABLE `t5` (
 | 
						|
  `c` int(11) DEFAULT NULL,
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
 | 
						|
SELECT * FROM t5 ORDER BY a,b,c;
 | 
						|
c	a	b
 | 
						|
SHOW CREATE TABLE t6;
 | 
						|
Table	t6
 | 
						|
Create Table	CREATE TABLE `t6` (
 | 
						|
  `c` int(11) DEFAULT NULL,
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
 | 
						|
SELECT * FROM t6 ORDER BY a,b,c;
 | 
						|
c	a	b
 | 
						|
NULL	1	2
 | 
						|
NULL	2	4
 | 
						|
NULL	3	6
 | 
						|
NULL	4	2
 | 
						|
NULL	5	10
 | 
						|
NULL	6	12
 | 
						|
**** On Slave ****
 | 
						|
SHOW CREATE TABLE t5;
 | 
						|
Table	t5
 | 
						|
Create Table	CREATE TABLE `t5` (
 | 
						|
  `c` int(11) DEFAULT NULL,
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MEMORY DEFAULT CHARSET=latin1
 | 
						|
SELECT * FROM t5 ORDER BY a,b,c;
 | 
						|
c	a	b
 | 
						|
SHOW CREATE TABLE t6;
 | 
						|
Table	t6
 | 
						|
Create Table	CREATE TABLE `t6` (
 | 
						|
  `c` int(11) DEFAULT NULL,
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MEMORY DEFAULT CHARSET=latin1
 | 
						|
SELECT * FROM t6 ORDER BY a,b,c;
 | 
						|
c	a	b
 | 
						|
NULL	1	2
 | 
						|
NULL	2	4
 | 
						|
NULL	3	6
 | 
						|
NULL	4	2
 | 
						|
NULL	5	10
 | 
						|
NULL	6	12
 | 
						|
CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;
 | 
						|
ERROR 23000: Duplicate entry '2' for key 'b'
 | 
						|
SHOW BINLOG EVENTS FROM 1256;
 | 
						|
Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 | 
						|
CREATE TABLE t7 (a INT, b INT UNIQUE);
 | 
						|
INSERT INTO t7 SELECT a,b FROM tt3;
 | 
						|
ERROR 23000: Duplicate entry '2' for key 'b'
 | 
						|
SELECT * FROM t7 ORDER BY a,b;
 | 
						|
a	b
 | 
						|
1	2
 | 
						|
2	4
 | 
						|
3	6
 | 
						|
SHOW BINLOG EVENTS FROM 1118;
 | 
						|
Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 | 
						|
master-bin.000001	1118	Query	1	1218	use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
 | 
						|
master-bin.000001	1218	Table_map	1	1258	table_id: # (test.t7)
 | 
						|
master-bin.000001	1258	Write_rows	1	1314	table_id: # flags: STMT_END_F
 | 
						|
SELECT * FROM t7 ORDER BY a,b;
 | 
						|
a	b
 | 
						|
1	2
 | 
						|
2	4
 | 
						|
3	6
 | 
						|
CREATE TEMPORARY TABLE tt4 (a INT, b INT);
 | 
						|
INSERT INTO tt4 VALUES (4,8), (5,10), (6,12);
 | 
						|
BEGIN;
 | 
						|
INSERT INTO t7 SELECT a,b FROM tt4;
 | 
						|
ROLLBACK;
 | 
						|
Warnings:
 | 
						|
Warning	1196	Some non-transactional changed tables couldn't be rolled back
 | 
						|
SHOW BINLOG EVENTS FROM 1314;
 | 
						|
Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 | 
						|
master-bin.000001	1314	Table_map	1	1354	table_id: # (test.t7)
 | 
						|
master-bin.000001	1354	Write_rows	1	1410	table_id: # flags: STMT_END_F
 | 
						|
SELECT * FROM t7 ORDER BY a,b;
 | 
						|
a	b
 | 
						|
1	2
 | 
						|
2	4
 | 
						|
3	6
 | 
						|
4	8
 | 
						|
5	10
 | 
						|
6	12
 | 
						|
SELECT * FROM t7 ORDER BY a,b;
 | 
						|
a	b
 | 
						|
1	2
 | 
						|
2	4
 | 
						|
3	6
 | 
						|
4	8
 | 
						|
5	10
 | 
						|
6	12
 | 
						|
CREATE TABLE t8 LIKE t4;
 | 
						|
CREATE TABLE t9 LIKE tt4;
 | 
						|
CREATE TEMPORARY TABLE tt5 LIKE t4;
 | 
						|
CREATE TEMPORARY TABLE tt6 LIKE tt4;
 | 
						|
CREATE TEMPORARY TABLE tt7 SELECT 1;
 | 
						|
**** On Master ****
 | 
						|
SHOW CREATE TABLE t8;
 | 
						|
Table	t8
 | 
						|
Create Table	CREATE TABLE `t8` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=()
 | 
						|
SHOW CREATE TABLE t9;
 | 
						|
Table	t9
 | 
						|
Create Table	CREATE TABLE `t9` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
 | 
						|
SHOW BINLOG EVENTS FROM 1410;
 | 
						|
Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 | 
						|
master-bin.000001	1410	Query	1	1496	use `test`; CREATE TABLE t8 LIKE t4
 | 
						|
master-bin.000001	1496	Query	1	1635	use `test`; CREATE TABLE `t9` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
)
 | 
						|
**** On Slave ****
 | 
						|
SHOW CREATE TABLE t8;
 | 
						|
Table	t8
 | 
						|
Create Table	CREATE TABLE `t8` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=()
 | 
						|
SHOW CREATE TABLE t9;
 | 
						|
Table	t9
 | 
						|
Create Table	CREATE TABLE `t9` (
 | 
						|
  `a` int(11) DEFAULT NULL,
 | 
						|
  `b` int(11) DEFAULT NULL
 | 
						|
) ENGINE=MEMORY DEFAULT CHARSET=latin1
 |