Merge main 5.0 -> 5.0-build (4f90ab4d) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/group_by.result

+30 −0

Original line number	Diff line number	Diff line
		@@ -1359,4 +1359,34 @@ tt
		41
		SET sql_mode=@save_sql_mode;
		DROP TABLE t1, t2;
		#
		# BUG#38072: Wrong result: HAVING not observed in a query with aggregate
		#
		CREATE TABLE t1 (
		pk int(11) NOT NULL AUTO_INCREMENT,
		int_nokey int(11) NOT NULL,
		int_key int(11) NOT NULL,
		varchar_key varchar(1) NOT NULL,
		varchar_nokey varchar(1) NOT NULL,
		PRIMARY KEY (pk),
		KEY int_key (int_key),
		KEY varchar_key (varchar_key)
		);
		INSERT INTO t1 VALUES
		(1,5,5, 'h','h'),
		(2,1,1, '{','{'),
		(3,1,1, 'z','z'),
		(4,8,8, 'x','x'),
		(5,7,7, 'o','o'),
		(6,3,3, 'p','p'),
		(7,9,9, 'c','c'),
		(8,0,0, 'k','k'),
		(9,6,6, 't','t'),
		(10,0,0,'c','c');
		explain SELECT COUNT(varchar_key) AS X FROM t1 WHERE pk = 8 having 'foo'='bar';
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible HAVING
		SELECT COUNT(varchar_key) AS X FROM t1 WHERE pk = 8 having 'foo'='bar';
		X
		drop table t1;
		End of 5.0 tests

+33 −2

Original line number	Diff line number	Diff line
		@@ -20,5 +20,36 @@ master_password='',master_port=SLAVE_PORT;
		start slave;
		flush logs;
		show slave status;
		Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
		# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 208 # # slave-bin.000001 Yes Yes 0 0 208 # None 0 No #
		Slave_IO_State #
		Master_Host 127.0.0.1
		Master_User root
		Master_Port MASTER_PORT
		Connect_Retry 1
		Master_Log_File master-bin.000001
		Read_Master_Log_Pos 98
		Relay_Log_File #
		Relay_Log_Pos #
		Relay_Master_Log_File master-bin.000001
		Slave_IO_Running Yes
		Slave_SQL_Running Yes
		Replicate_Do_DB
		Replicate_Ignore_DB
		Replicate_Do_Table
		Replicate_Ignore_Table #
		Replicate_Wild_Do_Table
		Replicate_Wild_Ignore_Table
		Last_Errno 0
		Last_Error
		Skip_Counter 0
		Exec_Master_Log_Pos 98
		Relay_Log_Space #
		Until_Condition None
		Until_Log_File
		Until_Log_Pos 0
		Master_SSL_Allowed No
		Master_SSL_CA_File
		Master_SSL_CA_Path
		Master_SSL_Cert
		Master_SSL_Cipher
		Master_SSL_Key
		Seconds_Behind_Master #

+18 −0

Original line number	Diff line number	Diff line
		@@ -6646,6 +6646,24 @@ ttt
		2
		drop function func30787;
		drop table t1;
		CREATE TABLE t1 (id INT);
		INSERT INTO t1 VALUES (1),(2),(3),(4);
		CREATE PROCEDURE test_sp()
		SELECT t1.* FROM t1 RIGHT JOIN t1 t2 ON t1.id=t2.id;
		CALL test_sp();
		id
		1
		2
		3
		4
		CALL test_sp();
		id
		1
		2
		3
		4
		DROP PROCEDURE test_sp;
		DROP TABLE t1;
		create table t1(c1 INT);
		create function f1(p1 int) returns varchar(32)
		return 'aaa';

+4 −4

Original line number	Diff line number	Diff line
		@@ -53,11 +53,11 @@ Assert Questions == 16
		SHOW STATUS LIKE 'Questions';
		Variable_name Value
		Questions 16
		Global status updated; Assert diff == 5
		Global status updated; Assert diff == 4
		FLUSH STATUS;
		SELECT 5;
		5
		5
		SELECT 4;
		4
		4
		DROP TABLE t1,t2;
		DROP PROCEDURE p1;
		DROP FUNCTION f1;

+2 −0