Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 (f45f47df) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/log_state.result

+11 −11

Original line number	Diff line number	Diff line
		@@ -14,15 +14,15 @@ set global general_log= ON;
		create table t1(f1 int);
		select * from mysql.general_log;
		event_time user_host thread_id server_id command_type argument
		TIMESTAMP root[root] @ localhost [] # 1 Query create table t1(f1 int)
		TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log
		TIMESTAMP USER_HOST # 1 Query create table t1(f1 int)
		TIMESTAMP USER_HOST # 1 Query select * from mysql.general_log
		set global general_log= OFF;
		drop table t1;
		select * from mysql.general_log;
		event_time user_host thread_id server_id command_type argument
		TIMESTAMP root[root] @ localhost [] # 1 Query create table t1(f1 int)
		TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log
		TIMESTAMP root[root] @ localhost [] # 1 Query set global general_log= OFF
		TIMESTAMP USER_HOST # 1 Query create table t1(f1 int)
		TIMESTAMP USER_HOST # 1 Query select * from mysql.general_log
		TIMESTAMP USER_HOST # 1 Query set global general_log= OFF
		set global general_log= ON;
		flush logs;
		show global variables
		@@ -46,7 +46,7 @@ sleep(2)
		0
		select * from mysql.slow_log;
		start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
		TIMESTAMP, root[root] @ localhost [] USER_HOST, QUERY_TIME 1 0 test 0 0 1 select sleep(2)
		TIMESTAMP USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 select sleep(2)
		show global variables
		where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
		Variable_name = 'general_log' or Variable_name = 'slow_query_log';
		@@ -67,9 +67,9 @@ create table t1(f1 int);
		drop table t1;
		select * from mysql.general_log;
		event_time user_host thread_id server_id command_type argument
		TIMESTAMP root[root] @ localhost [] # 1 Query create table t1(f1 int)
		TIMESTAMP root[root] @ localhost [] # 1 Query drop table t1
		TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log
		TIMESTAMP USER_HOST # 1 Query create table t1(f1 int)
		TIMESTAMP USER_HOST # 1 Query drop table t1
		TIMESTAMP USER_HOST # 1 Query select * from mysql.general_log
		set global general_log= OFF;
		truncate table mysql.general_log;
		select * from mysql.general_log;
		@@ -151,5 +151,5 @@ set global general_log=ON;
		drop table t1;
		select * from mysql.general_log;
		event_time user_host thread_id server_id command_type argument
		TIMESTAMP root[root] @ localhost [] # 1 Query drop table t1
		TIMESTAMP root[root] @ localhost [] # 1 Query select * from mysql.general_log
		TIMESTAMP USER_HOST # 1 Query drop table t1
		TIMESTAMP USER_HOST # 1 Query select * from mysql.general_log

mysql-test/r/partition_innodb.result

+15 −0

Original line number	Diff line number	Diff line
		@@ -92,3 +92,18 @@ DROP TABLE IF EXISTS t1;
		DROP TABLE IF EXISTS t0_aux;
		DROP TABLE IF EXISTS t0_definition;
		DROP TABLE IF EXISTS t0_template;
		create table t1 (id varchar(64) primary key) engine=innodb
		partition by key(id) partitions 5;
		insert into t1 values ('a');
		insert into t1 values ('aa');
		insert into t1 values ('aaa');
		select * from t1 where id = 'a';
		id
		a
		select * from t1 where id = 'aa';
		id
		aa
		select * from t1 where id = 'aaa';
		id
		aaa
		drop table t1;

mysql-test/r/partition_pruning.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra
		1 SIMPLE t2 p0,p1 ALL NULL NULL NULL NULL 3 Using where
		explain partitions select * from t2 where a=1 and b=1;
		id select_type table partitions type possible_keys key key_len ref rows Extra
		1 SIMPLE t2 p0 ALL NULL NULL NULL NULL 3 Using where
		1 SIMPLE t2 p0 ALL NULL NULL NULL NULL 2 Using where
		create table t3 (
		a int
		)

mysql-test/r/renamedb.result

+4 −0

Original line number	Diff line number	Diff line
		@@ -27,3 +27,7 @@ a
		2
		3
		drop database testdb2;
		create database testdb1;
		rename database testdb1 to testdb1;
		ERROR HY000: Can't create database 'testdb1'; database exists
		drop database testdb1;

mysql-test/t/log_state.test

+8 −8

Original line number	Diff line number	Diff line
		@@ -11,11 +11,11 @@ Variable_name = 'general_log' or Variable_name = 'slow_query_log';
		flush logs;
		set global general_log= ON;
		create table t1(f1 int);
		--replace_column 1 TIMESTAMP 3 #
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
		select * from mysql.general_log;
		set global general_log= OFF;
		drop table t1;
		--replace_column 1 TIMESTAMP 3 #
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
		select * from mysql.general_log;
		set global general_log= ON;
		flush logs;
		@@ -27,7 +27,7 @@ connect (con1,localhost,root,,);
		connection con1;
		set session long_query_time=1;
		select sleep(2);
		--replace_column 1 TIMESTAMP, 3 USER_HOST, 4 QUERY_TIME
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
		select * from mysql.slow_log;
		connection default;

		@@ -35,7 +35,7 @@ set global slow_query_log= ON;
		connection con1;
		set session long_query_time=1;
		select sleep(2);
		--replace_column 1 TIMESTAMP, 3 USER_HOST, 4 QUERY_TIME
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
		select * from mysql.slow_log;
		disconnect con1;
		connection default;
		@@ -54,11 +54,11 @@ set global general_log= ON;
		truncate table mysql.general_log;
		create table t1(f1 int);
		drop table t1;
		--replace_column 1 TIMESTAMP 3 #
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
		select * from mysql.general_log;
		set global general_log= OFF;
		truncate table mysql.general_log;
		--replace_column 1 TIMESTAMP 3 #
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
		select * from mysql.general_log;
		set global general_log= ON;
		show global variables
		@@ -109,14 +109,14 @@ truncate table mysql.general_log;
		show variables like 'log_output';
		set global general_log=ON;
		create table t1(f1 int);
		--replace_column 1 TIMESTAMP 3 #
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
		select * from mysql.general_log;
		set global general_log=OFF;
		set global log_output="FILE,TABLE";
		show variables like 'log_output';
		set global general_log=ON;
		drop table t1;
		--replace_column 1 TIMESTAMP 3 #
		--replace_column 1 TIMESTAMP 2 USER_HOST 3 #
		select * from mysql.general_log;

		--enable_ps_protocol