automerge (27a17b25) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/func_if.result

+46 −0

Original line number	Diff line number	Diff line
		@@ -131,3 +131,49 @@ drop table t1;
		select if(0, 18446744073709551610, 18446744073709551610);
		if(0, 18446744073709551610, 18446744073709551610)
		18446744073709551610
		CREATE TABLE t1(a DECIMAL(10,3));
		SELECT t1.a,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,0)))))))))))))))))))))))))))))) + 1
		FROM t1;
		a IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((R
		DROP TABLE t1;
		End of 5.0 tests

mysql-test/r/subselect.result

+11 −0

Original line number	Diff line number	Diff line
		@@ -4396,4 +4396,15 @@ id select_type table type possible_keys key key_len ref rows Extra
		Warnings:
		Note 1003 select 1 AS `1` from `test`.`t1` where <in_optimizer>(1,<exists>(select 1 AS `1` from `test`.`t1` where (`test`.`t1`.`a` > 3) group by `test`.`t1`.`a` having (<cache>(1) = <ref_null_helper>(1))))
		DROP TABLE t1;
		CREATE TABLE t1(pk int PRIMARY KEY, a int, INDEX idx(a));
		INSERT INTO t1 VALUES (1, 10), (3, 30), (2, 20);
		CREATE TABLE t2(pk int PRIMARY KEY, a int, b int, INDEX idxa(a));
		INSERT INTO t2 VALUES (2, 20, 700), (1, 10, 200), (4, 10, 100);
		SELECT * FROM t1
		WHERE EXISTS (SELECT DISTINCT a FROM t2 WHERE t1.a < t2.a ORDER BY b);
		pk a
		1 10
		3 30
		2 20
		DROP TABLE t1,t2;
		End of 5.0 tests.

mysql-test/t/func_if.test

+43 −0

Original line number	Diff line number	Diff line
		@@ -108,3 +108,46 @@ drop table t1;
		select if(0, 18446744073709551610, 18446744073709551610);


		#
		# Bug #37662: nested if() inside sum() is parsed in exponential time
		#

		CREATE TABLE t1(a DECIMAL(10,3));

		# check : should be fast. more than few secs means failure.
		SELECT t1.a,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,
		IF((ROUND(t1.a,2)=1), 2,0)))))))))))))))))))))))))))))) + 1
		FROM t1;

		DROP TABLE t1;

		--echo End of 5.0 tests

mysql-test/t/subselect.test

+12 −0

Original line number	Diff line number	Diff line
		@@ -3295,5 +3295,17 @@ EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT 1 FROM t1 GROUP BY a);
		EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT 1 FROM t1 WHERE a > 3 GROUP BY a);
		DROP TABLE t1;

		#
		# Bug #38191: Server crash with subquery containing DISTINCT and ORDER BY
		#

		CREATE TABLE t1(pk int PRIMARY KEY, a int, INDEX idx(a));
		INSERT INTO t1 VALUES (1, 10), (3, 30), (2, 20);
		CREATE TABLE t2(pk int PRIMARY KEY, a int, b int, INDEX idxa(a));
		INSERT INTO t2 VALUES (2, 20, 700), (1, 10, 200), (4, 10, 100);
		SELECT * FROM t1
		WHERE EXISTS (SELECT DISTINCT a FROM t2 WHERE t1.a < t2.a ORDER BY b);
		DROP TABLE t1,t2;

		--echo End of 5.0 tests.

scripts/mysql_system_tables.sql

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		-- The system tables of MySQL Server
		--

		set sql_mode='';
		set storage_engine=myisam;

		CREATE TABLE IF NOT EXISTS db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges';