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

cleanup

Browse Source
This commit is contained in:
Sergei Golubchik 2013-04-07 14:40:45 +02:00
parent a6fa724b7f
commit 37ad8d06e1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@ -3629,7 +3629,7 @@ bool get_lookup_field_values(THD *thd, COND *cond, TABLE_LIST *tables,
LOOKUP_FIELD_VALUES *lookup_field_values) LOOKUP_FIELD_VALUES *lookup_field_values)
{ {
LEX *lex= thd->lex; LEX *lex= thd->lex;
const char *wild= lex->wild ? lex->wild->ptr() : NullS; String *wild= lex->wild;
bool rc= 0; bool rc= 0;
bzero((char*) lookup_field_values, sizeof(LOOKUP_FIELD_VALUES)); bzero((char*) lookup_field_values, sizeof(LOOKUP_FIELD_VALUES));
@ -3637,7 +3637,8 @@ bool get_lookup_field_values(THD *thd, COND *cond, TABLE_LIST *tables,
case SQLCOM_SHOW_DATABASES: case SQLCOM_SHOW_DATABASES:
if (wild) if (wild)
{ {
thd->make_lex_string(&lookup_field_values->db_value, wild, strlen(wild)); thd->make_lex_string(&lookup_field_values->db_value,
wild->ptr(), wild->length());
lookup_field_values->wild_db_value= 1; lookup_field_values->wild_db_value= 1;
} }
break; break;
@ -3650,7 +3651,7 @@ bool get_lookup_field_values(THD *thd, COND *cond, TABLE_LIST *tables,
if (wild) if (wild)
{ {
thd->make_lex_string(&lookup_field_values->table_value, thd->make_lex_string(&lookup_field_values->table_value,
wild, strlen(wild)); wild->ptr(), wild->length());
lookup_field_values->wild_table_value= 1; lookup_field_values->wild_table_value= 1;
} }
break; break;