after merge fixes (de1dcee9) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ctype_ucs.result

+91 −2

Original line number	Diff line number	Diff line
		@@ -526,13 +526,102 @@ insert into t2 values (@v);
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 User var 1 136 @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
		master-bin.000001 136 Query 1 219 use `test`; insert into t2 values (@v)
		master-bin.000001 136 Query 1 226 use `test`; insert into t2 values (@v)
		flush logs;
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;
		SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;
		use test;
		SET TIMESTAMP=10000;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
		SET @@session.sql_mode=0;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
		insert into t2 values (@v);
		drop table t2;
		set names latin1;
		create table t1 (a enum('x','y','z') character set ucs2);
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` enum('x','y','z') character set ucs2 default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		insert into t1 values ('x');
		insert into t1 values ('y');
		insert into t1 values ('z');
		select a, hex(a) from t1 order by a;
		a hex(a)
		x 0078
		y 0079
		z 007A
		alter table t1 change a a enum('x','y','z','d','e','','','') character set ucs2;
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` enum('x','y','z','d','e','','','') character set ucs2 default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		insert into t1 values ('D');
		insert into t1 values ('E ');
		insert into t1 values ('');
		insert into t1 values ('');
		insert into t1 values ('');
		select a, hex(a) from t1 order by a;
		a hex(a)
		x 0078
		y 0079
		z 007A
		d 0064
		e 0065
		00E4
		00F6
		00FC
		drop table t1;
		create table t1 (a set ('x','y','z','','','') character set ucs2);
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` set('x','y','z','','','') character set ucs2 default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		insert into t1 values ('x');
		insert into t1 values ('y');
		insert into t1 values ('z');
		insert into t1 values ('x,y');
		insert into t1 values ('x,y,z,,,');
		select a, hex(a) from t1 order by a;
		a hex(a)
		x 0078
		y 0079
		x,y 0078002C0079
		z 007A
		x,y,z,,, 0078002C0079002C007A002C00E4002C00F6002C00FC
		drop table t1;
		create table t1(a enum('a','b','c')) default character set ucs2;
		insert into t1 values('a'),('b'),('c');
		alter table t1 add b char(1);
		show warnings;
		Level Code Message
		select * from t1 order by a;
		a b
		a NULL
		b NULL
		c NULL
		drop table t1;
		SET collation_connection='ucs2_general_ci';
		create table t1 select repeat('a',4000) a;
		delete from t1;
		insert into t1 values ('a'), ('a '), ('a\t');
		select collation(a),hex(a) from t1 order by a;
		collation(a) hex(a)
		ucs2_general_ci 00610009
		ucs2_general_ci 0061
		ucs2_general_ci 00610020
		drop table t1;
		SET NAMES latin1;
		SET collation_connection='ucs2_bin';
		create table t1 select repeat('a',4000) a;
		delete from t1;
		insert into t1 values ('a'), ('a '), ('a\t');
		select collation(a),hex(a) from t1 order by a;
		collation(a) hex(a)
		ucs2_bin 00610009
		ucs2_bin 0061
		ucs2_bin 00610020
		drop table t1;

mysql-test/r/drop_temp_table.result

+11 −5

Original line number	Diff line number	Diff line
		reset master;
		create database `drop-temp+table-test`;
		use `drop-temp+table-test`;
		create temporary table shortn1 (a int);
		create temporary table `table:name` (a int);
		create temporary table shortn2 (a int);
		select get_lock("a",10);
		get_lock("a",10)
		1
		@@ -10,9 +12,13 @@ get_lock("a",10)
		1
		show binlog events;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4
		master-bin.000001 96 Query 1 207 create database `drop-temp+table-test`
		master-bin.000001 207 Query 1 323 use `drop-temp+table-test`; create temporary table `table:name` (a int)
		master-bin.000001 323 Query 1 474 use `drop-temp+table-test`; DROP /!40005 TEMPORARY / TABLE IF EXISTS `drop-temp+table-test`.`table:name`
		master-bin.000001 474 Query 1 567 use `drop-temp+table-test`; DO RELEASE_LOCK("a")
		master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
		master-bin.000001 # Query 1 # create database `drop-temp+table-test`
		master-bin.000001 # Query 1 # use `drop-temp+table-test`; create temporary table shortn1 (a int)
		master-bin.000001 # Query 1 # use `drop-temp+table-test`; create temporary table `table:name` (a int)
		master-bin.000001 # Query 1 # use `drop-temp+table-test`; create temporary table shortn2 (a int)
		master-bin.000001 # Query 1 # use `drop-temp+table-test`; DROP /!40005 TEMPORARY / TABLE IF EXISTS `drop-temp+table-test`.`shortn2`
		master-bin.000001 # Query 1 # use `drop-temp+table-test`; DROP /!40005 TEMPORARY / TABLE IF EXISTS `drop-temp+table-test`.`table:name`
		master-bin.000001 # Query 1 # use `drop-temp+table-test`; DROP /!40005 TEMPORARY / TABLE IF EXISTS `drop-temp+table-test`.`shortn1`
		master-bin.000001 # Query 1 # use `drop-temp+table-test`; DO RELEASE_LOCK("a")
		drop database `drop-temp+table-test`;

mysql-test/r/innodb.result

+110 −11

Original line number	Diff line number	Diff line
		@@ -249,6 +249,30 @@ n
		4
		5
		6
		set autocommit=0;
		begin;
		savepoint `my_savepoint`;
		insert into t1 values (7);
		savepoint `savept2`;
		insert into t1 values (3);
		select n from t1;
		n
		3
		4
		5
		6
		7
		rollback to savepoint `savept2`;
		release savepoint `my_savepoint`;
		select n from t1;
		n
		4
		5
		6
		7
		rollback to savepoint `my_savepoint`;
		ERROR 42000: SAVEPOINT my_savepoint does not exist
		set autocommit=1;
		rollback;
		drop table t1;
		create table t1 (n int not null primary key) engine=innodb;
		@@ -1326,8 +1350,8 @@ truncate table t1;
		insert into t1 (a) values (NULL),(NULL);
		SELECT * from t1;
		a
		3
		4
		1
		2
		drop table t1;
		CREATE TABLE t1 (`id 1` INT NOT NULL, PRIMARY KEY (`id 1`)) ENGINE=INNODB;
		CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id), FOREIGN KEY (`t1_id`) REFERENCES `t1`(`id 1`) ON DELETE CASCADE ) ENGINE=INNODB;
		@@ -1421,19 +1445,19 @@ insert t2 select * from t1;
		insert t3 select * from t1;
		checksum table t1, t2, t3, t4 quick;
		Table Checksum
		test.t1 272226711
		test.t1 2948697075
		test.t2 NULL
		test.t3 NULL
		test.t4 NULL
		checksum table t1, t2, t3, t4;
		Table Checksum
		test.t1 272226711
		test.t1 2948697075
		test.t2 968604391
		test.t3 968604391
		test.t4 NULL
		checksum table t1, t2, t3, t4 extended;
		Table Checksum
		test.t1 272226711
		test.t1 3092701434
		test.t2 968604391
		test.t3 968604391
		test.t4 NULL
		@@ -1609,14 +1633,14 @@ t2 CREATE TABLE `t2` (
		drop table t2, t1;
		show status like "binlog_cache_use";
		Variable_name Value
		Binlog_cache_use 150
		Binlog_cache_use 152
		show status like "binlog_cache_disk_use";
		Variable_name Value
		Binlog_cache_disk_use 0
		create table t1 (a int) engine=innodb;
		show status like "binlog_cache_use";
		Variable_name Value
		Binlog_cache_use 151
		Binlog_cache_use 153
		show status like "binlog_cache_disk_use";
		Variable_name Value
		Binlog_cache_disk_use 1
		@@ -1625,7 +1649,7 @@ delete from t1;
		commit;
		show status like "binlog_cache_use";
		Variable_name Value
		Binlog_cache_use 152
		Binlog_cache_use 154
		show status like "binlog_cache_disk_use";
		Variable_name Value
		Binlog_cache_disk_use 1
		@@ -1690,15 +1714,90 @@ Variable_name Value
		Innodb_page_size 16384
		show status like "Innodb_rows_deleted";
		Variable_name Value
		Innodb_rows_deleted 2078
		Innodb_rows_deleted 2070
		show status like "Innodb_rows_inserted";
		Variable_name Value
		Innodb_rows_inserted 31706
		Innodb_rows_inserted 31708
		show status like "Innodb_rows_read";
		Variable_name Value
		Innodb_rows_read 80161
		Innodb_rows_read 80162
		show status like "Innodb_rows_updated";
		Variable_name Value
		Innodb_rows_updated 29530
		show status like "Innodb_row_lock_waits";
		Variable_name Value
		Innodb_row_lock_waits 0
		show status like "Innodb_row_lock_current_waits";
		Variable_name Value
		Innodb_row_lock_current_waits 0
		show status like "Innodb_row_lock_time";
		Variable_name Value
		Innodb_row_lock_time 0
		show status like "Innodb_row_lock_time_max";
		Variable_name Value
		Innodb_row_lock_time_max 0
		show status like "Innodb_row_lock_time_avg";
		Variable_name Value
		Innodb_row_lock_time_avg 0
		show variables like "innodb_sync_spin_loops";
		Variable_name Value
		innodb_sync_spin_loops 20
		set global innodb_sync_spin_loops=1000;
		show variables like "innodb_sync_spin_loops";
		Variable_name Value
		innodb_sync_spin_loops 1000
		set global innodb_sync_spin_loops=0;
		show variables like "innodb_sync_spin_loops";
		Variable_name Value
		innodb_sync_spin_loops 0
		set global innodb_sync_spin_loops=20;
		show variables like "innodb_sync_spin_loops";
		Variable_name Value
		innodb_sync_spin_loops 20
		show variables like "innodb_thread_concurrency";
		Variable_name Value
		innodb_thread_concurrency 8
		set global innodb_thread_concurrency=1000;
		show variables like "innodb_thread_concurrency";
		Variable_name Value
		innodb_thread_concurrency 1000
		set global innodb_thread_concurrency=0;
		show variables like "innodb_thread_concurrency";
		Variable_name Value
		innodb_thread_concurrency 1
		set global innodb_thread_concurrency=16;
		show variables like "innodb_thread_concurrency";
		Variable_name Value
		innodb_thread_concurrency 16
		show variables like "innodb_concurrency_tickets";
		Variable_name Value
		innodb_concurrency_tickets 500
		set global innodb_concurrency_tickets=1000;
		show variables like "innodb_concurrency_tickets";
		Variable_name Value
		innodb_concurrency_tickets 1000
		set global innodb_concurrency_tickets=0;
		show variables like "innodb_concurrency_tickets";
		Variable_name Value
		innodb_concurrency_tickets 1
		set global innodb_concurrency_tickets=500;
		show variables like "innodb_concurrency_tickets";
		Variable_name Value
		innodb_concurrency_tickets 500
		show variables like "innodb_thread_sleep_delay";
		Variable_name Value
		innodb_thread_sleep_delay 10000
		set global innodb_thread_sleep_delay=100000;
		show variables like "innodb_thread_sleep_delay";
		Variable_name Value
		innodb_thread_sleep_delay 100000
		set global innodb_thread_sleep_delay=0;
		show variables like "innodb_thread_sleep_delay";
		Variable_name Value
		innodb_thread_sleep_delay 0
		set global innodb_thread_sleep_delay=10000;
		show variables like "innodb_thread_sleep_delay";
		Variable_name Value
		innodb_thread_sleep_delay 10000
		create table t1 (v varchar(16384)) engine=innodb;
		ERROR 42000: Column length too big for column 'v' (max = 255); use BLOB instead

mysql-test/r/insert_select.result

+13 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ ERROR 23000: Duplicate entry '2' for key 1
		show binlog events;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4
		master-bin.000001 96 Query 1 184 use `test`; insert into t1 select * from t2
		master-bin.000001 96 Query 1 191 use `test`; insert into t1 select * from t2
		select * from t1;
		a
		1
		@@ -638,3 +638,15 @@ No Field Count
		0 1 100
		0 2 100
		drop table t1, t2;
		CREATE TABLE t1 (
		ID int(11) NOT NULL auto_increment,
		NO int(11) NOT NULL default '0',
		SEQ int(11) NOT NULL default '0',
		PRIMARY KEY (ID),
		KEY t1$NO (SEQ,NO)
		) ENGINE=MyISAM;
		INSERT INTO t1 (SEQ, NO) SELECT "1" AS SEQ, IF(MAX(NO) IS NULL, 0, MAX(NO)) + 1 AS NO FROM t1 WHERE (SEQ = 1);
		select SQL_BUFFER_RESULT * from t1 WHERE (SEQ = 1);
		ID NO SEQ
		1 1 1
		drop table t1;

mysql-test/r/mix_innodb_myisam_binlog.result

+43 −43

Original line number	Diff line number	Diff line
		@@ -9,9 +9,9 @@ commit;
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(1)
		master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 327 Xid 1 # COMMIT /* xid=7 */
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(1)
		master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 348 Xid 1 # COMMIT /* xid=7 */
		delete from t1;
		delete from t2;
		reset master;
		@@ -24,9 +24,9 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(2)
		master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 327 Query 1 # use `test`; ROLLBACK
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(2)
		master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 348 Query 1 # use `test`; ROLLBACK
		delete from t1;
		delete from t2;
		reset master;
		@@ -42,12 +42,12 @@ commit;
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(3)
		master-bin.000001 239 Query 1 # use `test`; savepoint my_savepoint
		master-bin.000001 318 Query 1 # use `test`; insert into t1 values(4)
		master-bin.000001 399 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 487 Query 1 # use `test`; rollback to savepoint my_savepoint
		master-bin.000001 578 Xid 1 # COMMIT /* xid=24 */
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(3)
		master-bin.000001 253 Query 1 # use `test`; savepoint my_savepoint
		master-bin.000001 339 Query 1 # use `test`; insert into t1 values(4)
		master-bin.000001 427 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 522 Query 1 # use `test`; rollback to savepoint my_savepoint
		master-bin.000001 620 Xid 1 # COMMIT /* xid=24 */
		delete from t1;
		delete from t2;
		reset master;
		@@ -68,13 +68,13 @@ a
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(5)
		master-bin.000001 239 Query 1 # use `test`; savepoint my_savepoint
		master-bin.000001 318 Query 1 # use `test`; insert into t1 values(6)
		master-bin.000001 399 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 487 Query 1 # use `test`; rollback to savepoint my_savepoint
		master-bin.000001 578 Query 1 # use `test`; insert into t1 values(7)
		master-bin.000001 659 Xid 1 # COMMIT /* xid=36 */
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(5)
		master-bin.000001 253 Query 1 # use `test`; savepoint my_savepoint
		master-bin.000001 339 Query 1 # use `test`; insert into t1 values(6)
		master-bin.000001 427 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 522 Query 1 # use `test`; rollback to savepoint my_savepoint
		master-bin.000001 620 Query 1 # use `test`; insert into t1 values(7)
		master-bin.000001 708 Xid 1 # COMMIT /* xid=36 */
		delete from t1;
		delete from t2;
		reset master;
		@@ -90,10 +90,10 @@ get_lock("a",10)
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(8)
		master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 327 Query 1 # use `test`; ROLLBACK
		master-bin.000001 392 Query 1 # use `test`; DO RELEASE_LOCK("a")
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(8)
		master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 348 Query 1 # use `test`; ROLLBACK
		master-bin.000001 420 Query 1 # use `test`; DO RELEASE_LOCK("a")
		delete from t1;
		delete from t2;
		reset master;
		@@ -102,9 +102,9 @@ insert into t2 select * from t1;
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(9)
		master-bin.000001 239 Xid 1 # COMMIT /* xid=59 */
		master-bin.000001 266 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(9)
		master-bin.000001 253 Xid 1 # COMMIT /* xid=59 */
		master-bin.000001 280 Query 1 # use `test`; insert into t2 select * from t1
		delete from t1;
		delete from t2;
		reset master;
		@@ -114,20 +114,20 @@ insert into t2 select * from t1;
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(10)
		master-bin.000001 240 Xid 1 # COMMIT /* xid=65 */
		master-bin.000001 267 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(10)
		master-bin.000001 254 Xid 1 # COMMIT /* xid=65 */
		master-bin.000001 281 Query 1 # use `test`; insert into t2 select * from t1
		insert into t1 values(11);
		commit;
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(10)
		master-bin.000001 240 Xid 1 # COMMIT /* xid=65 */
		master-bin.000001 267 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 355 Query 1 # use `test`; BEGIN
		master-bin.000001 417 Query 1 # use `test`; insert into t1 values(11)
		master-bin.000001 499 Xid 1 # COMMIT /* xid=67 */
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(10)
		master-bin.000001 254 Xid 1 # COMMIT /* xid=65 */
		master-bin.000001 281 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 376 Query 1 # use `test`; BEGIN
		master-bin.000001 445 Query 1 # use `test`; insert into t1 values(11)
		master-bin.000001 534 Xid 1 # COMMIT /* xid=67 */
		alter table t2 engine=INNODB;
		delete from t1;
		delete from t2;
		@@ -139,9 +139,9 @@ commit;
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(12)
		master-bin.000001 240 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 328 Xid 1 # COMMIT /* xid=77 */
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(12)
		master-bin.000001 254 Query 1 # use `test`; insert into t2 select * from t1
		master-bin.000001 349 Xid 1 # COMMIT /* xid=77 */
		delete from t1;
		delete from t2;
		reset master;
		@@ -164,8 +164,8 @@ commit;
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(14)
		master-bin.000001 240 Xid 1 # COMMIT /* xid=93 */
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(14)
		master-bin.000001 254 Xid 1 # COMMIT /* xid=93 */
		delete from t1;
		delete from t2;
		reset master;
		@@ -184,9 +184,9 @@ a
		show binlog events from 96;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 96 Query 1 # use `test`; BEGIN
		master-bin.000001 158 Query 1 # use `test`; insert into t1 values(16)
		master-bin.000001 240 Query 1 # use `test`; insert into t1 values(18)
		master-bin.000001 322 Xid 1 # COMMIT /* xid=104 */
		master-bin.000001 165 Query 1 # use `test`; insert into t1 values(16)
		master-bin.000001 254 Query 1 # use `test`; insert into t1 values(18)
		master-bin.000001 343 Xid 1 # COMMIT /* xid=104 */
		delete from t1;
		delete from t2;
		alter table t2 type=MyISAM;