mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

5.1-bugteam->trunk-merge merge

Browse source
This commit is contained in:
Sergey Glukhov 2010-06-25 12:08:54 +04:00
commit 68c5b5445e
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/r/information_schema.result
View file

@ -1681,6 +1681,16 @@ COUNT(*)
DROP USER nonpriv; DROP USER nonpriv;
DROP TABLE db1.t1; DROP TABLE db1.t1;
DROP DATABASE db1; DROP DATABASE db1;
Bug#54422 query with = 'variables'
CREATE TABLE variables(f1 INT);
SELECT COLUMN_DEFAULT, TABLE_NAME
FROM INFORMATION_SCHEMA.COLUMNS
WHERE INFORMATION_SCHEMA.COLUMNS.TABLE_NAME = 'variables';
COLUMN_DEFAULT TABLE_NAME
NULL variables
DROP TABLE variables;
End of 5.1 tests. End of 5.1 tests.
# #
# Additional test for WL#3726 "DDL locking for all metadata objects" # Additional test for WL#3726 "DDL locking for all metadata objects"

9
mysql-test/t/information_schema.test
View file

@ -1416,6 +1416,15 @@ DROP USER nonpriv;
DROP TABLE db1.t1; DROP TABLE db1.t1;
DROP DATABASE db1; DROP DATABASE db1;
--echo
--echo Bug#54422 query with = 'variables'
--echo
CREATE TABLE variables(f1 INT);
SELECT COLUMN_DEFAULT, TABLE_NAME
FROM INFORMATION_SCHEMA.COLUMNS
WHERE INFORMATION_SCHEMA.COLUMNS.TABLE_NAME = 'variables';
DROP TABLE variables;
--echo End of 5.1 tests. --echo End of 5.1 tests.

4
sql/sql_show.cc
View file

@ -2857,7 +2857,9 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex,
{ {
if (with_i_schema) if (with_i_schema)
{ {
if (find_schema_table(thd, lookup_field_vals->table_value.str)) ST_SCHEMA_TABLE *schema_table=
find_schema_table(thd, lookup_field_vals->table_value.str);
if (schema_table && !schema_table->hidden)
{ {
if (table_names->push_back(&lookup_field_vals->table_value)) if (table_names->push_back(&lookup_field_vals->table_value))
return 1; return 1;