merge (c3f07acf) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqlcheck.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -488,9 +488,14 @@ static int process_all_tables_in_db(char *database)
		LINT_INIT(res);
		if (use_db(database))
		return 1;
		if (mysql_query(sock, "SHOW /!50002 FULL/ TABLES") \|\|
		!((res= mysql_store_result(sock))))
		if ((mysql_query(sock, "SHOW /!50002 FULL/ TABLES") &&
		mysql_query(sock, "SHOW TABLES")) \|\|
		!(res= mysql_store_result(sock)))
		{
		my_printf_error(0, "Error: Couldn't get table list for database %s: %s",
		MYF(0), database, mysql_error(sock));
		return 1;
		}

		num_columns= mysql_num_fields(res);

mysql-test/include/check-testcase.test

+19 −19

Original line number	Diff line number	Diff line
		@@ -11,12 +11,12 @@
		#
		# Dump all global variables
		#
		show global variables;
		SHOW GLOBAL VARIABLES WHERE variable_name != 'timestamp';

		#
		# Dump all databases
		#
		show databases;
		SHOW DATABASES;

		#
		# Dump the "test" database, all it's tables and their data
		@@ -29,23 +29,23 @@ show databases;
		#
		--exec $MYSQL_DUMP --skip-comments --no-data mysql
		use mysql;
		select * from columns_priv;
		select * from db order by host, db, user;
		select * from func;
		select * from help_category;
		select * from help_keyword;
		select * from help_relation;
		select * from help_relation;
		select * from host;
		select * from proc;
		select * from procs_priv;
		select * from tables_priv;
		select * from time_zone;
		select * from time_zone_leap_second;
		select * from time_zone_name;
		select * from time_zone_transition;
		select * from time_zone_transition_type;
		select * from user;
		SELECT * FROM columns_priv;
		SELECT * FROM db ORDER BY host, db, user;
		SELECT * FROM func;
		SELECT * FROM help_category;
		SELECT * FROM help_keyword;
		SELECT * FROM help_relation;
		SELECT * FROM help_relation;
		SELECT * FROM host;
		SELECT * FROM proc;
		SELECT * FROM procs_priv;
		SELECT * FROM tables_priv;
		SELECT * FROM time_zone;
		SELECT * FROM time_zone_leap_second;
		SELECT * FROM time_zone_name;
		SELECT * FROM time_zone_transition;
		SELECT * FROM time_zone_transition_type;
		SELECT * FROM user;

mysql-test/r/ctype_utf8.result

+32 −0

Original line number	Diff line number	Diff line
		@@ -1813,3 +1813,35 @@ select hex(_utf8 B'001111111111');
		ERROR HY000: Invalid utf8 character string: 'FF'
		select (_utf8 X'616263FF');
		ERROR HY000: Invalid utf8 character string: 'FF'
		CREATE TABLE t1 (a INT NOT NULL, b INT NOT NULL);
		INSERT INTO t1 VALUES (70000, 1092), (70001, 1085), (70002, 1065);
		SELECT CONVERT(a, CHAR), CONVERT(b, CHAR) FROM t1 GROUP BY b;
		CONVERT(a, CHAR) CONVERT(b, CHAR)
		70002 1065
		70001 1085
		70000 1092
		SELECT CONVERT(a, CHAR), CONVERT(b, CHAR) FROM t1;
		CONVERT(a, CHAR) CONVERT(b, CHAR)
		70000 1092
		70001 1085
		70002 1065
		ALTER TABLE t1 ADD UNIQUE (b);
		SELECT CONVERT(a, CHAR), CONVERT(b, CHAR) FROM t1 GROUP BY b;
		CONVERT(a, CHAR) CONVERT(b, CHAR)
		70002 1065
		70001 1085
		70000 1092
		DROP INDEX b ON t1;
		SELECT CONVERT(a, CHAR), CONVERT(b, CHAR) FROM t1 GROUP BY b;
		CONVERT(a, CHAR) CONVERT(b, CHAR)
		70002 1065
		70001 1085
		70000 1092
		ALTER TABLE t1 ADD INDEX (b);
		SELECT CONVERT(a, CHAR), CONVERT(b, CHAR) from t1 GROUP BY b;
		CONVERT(a, CHAR) CONVERT(b, CHAR)
		70002 1065
		70001 1085
		70000 1092
		DROP TABLE t1;
		End of 5.0 tests

mysql-test/r/federated.result

+9 −0

Original line number	Diff line number	Diff line
		@@ -2085,6 +2085,15 @@ Table Checksum
		test.t1 2465757603
		DROP TABLE t1;
		DROP TABLE t1;
		CREATE TABLE t1 (a TEXT, b TEXT, KEY(b(1)));
		INSERT INTO t1 VALUES (NULL, NULL), (NULL, NULL), (NULL, NULL), (NULL, NULL);
		CREATE TABLE t1
		(a TEXT, b TEXT, KEY(b(1))) ENGINE=FEDERATED
		CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';
		SELECT t1.a FROM t1, t1 as t2 WHERE t2.b NOT LIKE t1.b;
		a
		DROP TABLE t1;
		DROP TABLE t1;
		End of 5.0 tests
		SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
		SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;

mysql-test/r/fulltext.result

+28 −0

Original line number	Diff line number	Diff line
		@@ -469,3 +469,31 @@ SELECT * FROM t1 WHERE MATCH(a) AGAINST ('"aaaa"' IN BOOLEAN MODE);
		a
		aaaaa aaaa
		DROP TABLE t1;
		CREATE TABLE t1 (a VARCHAR(255), b INT, FULLTEXT(a), KEY(b));
		INSERT INTO t1 VALUES('test', 1),('test', 1),('test', 1),('test', 1),
		('test', 1),('test', 2),('test', 3),('test', 4);
		EXPLAIN SELECT * FROM t1
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 fulltext b,a a 0 1 Using where
		EXPLAIN SELECT * FROM t1 USE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 fulltext a a 0 1 Using where
		EXPLAIN SELECT * FROM t1 FORCE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 fulltext a a 0 1 Using where
		EXPLAIN SELECT * FROM t1 IGNORE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ref b b 5 const 4 Using where
		EXPLAIN SELECT * FROM t1 USE INDEX(b)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ref b b 5 const 4 Using where
		EXPLAIN SELECT * FROM t1 FORCE INDEX(b)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ref b b 5 const 4 Using where
		DROP TABLE t1;