1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powermacg5 problem fix

Browse Source 
we need a copy of I_S name because the name can be changed in case of lowercase_table_name!=0
This commit is contained in:
unknown 2007-08-03 14:17:51 +05:00
parent 1440a30dfe
commit 072a190820
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_show.cc
View File

@ -2535,6 +2535,10 @@ int make_db_list(THD *thd, List<LEX_STRING> *files,
LOOKUP_FIELD_VALUES *lookup_field_vals, LOOKUP_FIELD_VALUES *lookup_field_vals,
bool *with_i_schema) bool *with_i_schema)
{ {
LEX_STRING *i_s_name_copy= 0;
i_s_name_copy= thd->make_lex_string(i_s_name_copy,
INFORMATION_SCHEMA_NAME.str,
INFORMATION_SCHEMA_NAME.length, TRUE);
*with_i_schema= 0; *with_i_schema= 0;
if (lookup_field_vals->wild_db_value) if (lookup_field_vals->wild_db_value)
{ {
@ -2549,7 +2553,7 @@ int make_db_list(THD *thd, List<LEX_STRING> *files,
lookup_field_vals->db_value.str)) lookup_field_vals->db_value.str))
{ {
*with_i_schema= 1; *with_i_schema= 1;
if (files->push_back(&INFORMATION_SCHEMA_NAME)) if (files->push_back(i_s_name_copy))
return 1; return 1;
} }
return (find_files(thd, files, NullS, mysql_data_home, return (find_files(thd, files, NullS, mysql_data_home,
@ -2567,7 +2571,7 @@ int make_db_list(THD *thd, List<LEX_STRING> *files,
lookup_field_vals->db_value.str)) lookup_field_vals->db_value.str))
{ {
*with_i_schema= 1; *with_i_schema= 1;
if (files->push_back(&INFORMATION_SCHEMA_NAME)) if (files->push_back(i_s_name_copy))
return 1; return 1;
return 0; return 0;
} }
@ -2580,7 +2584,7 @@ int make_db_list(THD *thd, List<LEX_STRING> *files,
Create list of existing databases. It is used in case Create list of existing databases. It is used in case
of select from information schema table of select from information schema table
*/ */
if (files->push_back(&INFORMATION_SCHEMA_NAME)) if (files->push_back(i_s_name_copy))
return 1; return 1;
*with_i_schema= 1; *with_i_schema= 1;
return (find_files(thd, files, NullS, return (find_files(thd, files, NullS,