Merge gleb.loc:/home/uchum/work/bk/5.0 (ff042427) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+5 −0

Original line number	Diff line number	Diff line
		@@ -1345,3 +1345,8 @@ zlib/*.vcproj
		debian/control
		debian/defs.mk
		include/abi_check
		support-files/mysqld_multi.server
		tests/bug25714
		cscope.in.out
		cscope.out
		cscope.po.out

client/mysqldump.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2898,7 +2898,7 @@ int init_dumping_tables(char *qdatabase)
		/* Old server version, dump generic CREATE DATABASE */
		if (opt_drop_database)
		fprintf(md_result_file,
		"\n/!40000 DROP DATABASE IF EXISTS %s;/\n",
		"\n/!40000 DROP DATABASE IF EXISTS %s/;\n",
		qdatabase);
		fprintf(md_result_file,
		"\nCREATE DATABASE /!32312 IF NOT EXISTS/ %s;\n",

mysql-test/r/delete.result

+48 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,17 @@ select @a;
		@a
		1
		drop table t1;
		CREATE TABLE t1 (
		`date` date ,
		`time` time ,
		`seq` int(10) unsigned NOT NULL auto_increment,
		PRIMARY KEY (`seq`),
		KEY `seq` (`seq`),
		KEY `time` (`time`),
		KEY `date` (`date`)
		);
		DELETE FROM t1 ORDER BY date ASC, time ASC LIMIT 1;
		drop table t1;
		End of 4.1 tests
		CREATE TABLE t1 (a int not null,b int not null);
		CREATE TABLE t2 (a int not null, b int not null, primary key (a,b));
		@@ -223,3 +234,40 @@ ERROR 42S22: Unknown column 't2.x' in 'order clause'
		DELETE FROM t1 ORDER BY (SELECT x);
		ERROR 42S22: Unknown column 'x' in 'field list'
		DROP TABLE t1;
		CREATE TABLE t1 (
		a INT
		);
		CREATE TABLE t2 (
		a INT
		);
		CREATE DATABASE db1;
		CREATE TABLE db1.t1 (
		a INT
		);
		INSERT INTO db1.t1 (a) SELECT * FROM t1;
		CREATE DATABASE db2;
		CREATE TABLE db2.t1 (
		a INT
		);
		INSERT INTO db2.t1 (a) SELECT * FROM t2;
		DELETE FROM t1 alias USING t1, t2 alias WHERE t1.a = alias.a;
		ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alias USING t1, t2 alias WHERE t1.a = alias.a' at line 1
		DELETE FROM alias USING t1, t2 alias WHERE t1.a = alias.a;
		DELETE FROM t1, alias USING t1, t2 alias WHERE t1.a = alias.a;
		DELETE FROM t1, t2 USING t1, t2 alias WHERE t1.a = alias.a;
		ERROR 42S02: Unknown table 't2' in MULTI DELETE
		DELETE FROM db1.t1 alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a;
		ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a' at line 1
		DELETE FROM alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a;
		ERROR 42S02: Unknown table 'alias' in MULTI DELETE
		DELETE FROM db2.alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a;
		DELETE FROM t1 USING t1 WHERE a = 1;
		SELECT * FROM t1;
		a
		DELETE FROM t1 alias USING t1 alias WHERE a = 2;
		ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alias USING t1 alias WHERE a = 2' at line 1
		SELECT * FROM t1;
		a
		DROP TABLE t1, t2;
		DROP DATABASE db1;
		DROP DATABASE db2;

mysql-test/r/distinct.result

+3 −3

Original line number	Diff line number	Diff line
		@@ -526,10 +526,10 @@ id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 index NULL PRIMARY 4 NULL 3 Using index
		EXPLAIN SELECT a,b FROM t1 GROUP BY a,b;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using filesort
		EXPLAIN SELECT DISTINCT a,b FROM t1 GROUP BY a,b;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using filesort
		CREATE TABLE t2(a INT, b INT NOT NULL, c INT NOT NULL, d INT,
		PRIMARY KEY (a,b));
		INSERT INTO t2 VALUES (1,1,1,50), (1,2,3,40), (2,1,3,4);
		@@ -554,7 +554,7 @@ id select_type table type possible_keys key key_len ref rows Extra
		CREATE UNIQUE INDEX c_b_unq ON t2 (c,b);
		EXPLAIN SELECT DISTINCT a,b,d FROM t2 GROUP BY c,b,d;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2 ALL NULL NULL NULL NULL 3
		1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using filesort
		DROP TABLE t1,t2;
		create table t1 (id int, dsc varchar(50));
		insert into t1 values (1, "line number one"), (2, "line number two"), (3, "line number three");

mysql-test/r/group_by.result

+49 −0

Original line number	Diff line number	Diff line
		@@ -1064,3 +1064,52 @@ select t1.f1,t.* from t1, t1 t group by 1;
		ERROR 42000: 'test.t.f1' isn't in GROUP BY
		drop table t1;
		SET SQL_MODE = '';
		CREATE TABLE t1(
		a INT,
		b INT NOT NULL,
		c INT NOT NULL,
		d INT,
		UNIQUE KEY (c,b)
		);
		INSERT INTO t1 VALUES (1,1,1,50), (1,2,3,40), (2,1,3,4);
		EXPLAIN SELECT c,b,d FROM t1 GROUP BY c,b,d;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using filesort
		SELECT c,b,d FROM t1 GROUP BY c,b,d;
		c b d
		1 1 50
		3 1 4
		3 2 40
		EXPLAIN SELECT c,b,d FROM t1 GROUP BY c,b,d ORDER BY NULL;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3
		SELECT c,b,d FROM t1 GROUP BY c,b,d ORDER BY NULL;
		c b d
		1 1 50
		3 2 40
		3 1 4
		EXPLAIN SELECT c,b,d FROM t1 ORDER BY c,b,d;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using filesort
		SELECT c,b,d FROM t1 ORDER BY c,b,d;
		c b d
		1 1 50
		3 1 4
		3 2 40
		EXPLAIN SELECT c,b,d FROM t1 GROUP BY c,b;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using filesort
		SELECT c,b,d FROM t1 GROUP BY c,b;
		c b d
		1 1 50
		3 1 4
		3 2 40
		EXPLAIN SELECT c,b FROM t1 GROUP BY c,b;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 index NULL c 8 NULL 3 Using index
		SELECT c,b FROM t1 GROUP BY c,b;
		c b
		1 1
		3 1
		3 2
		DROP TABLE t1;