database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

Browse Source 
into  example.com:/work/mysql-5.1-runtime
This commit is contained in:
andrey@example.com
2006-08-17 19:09:55 +02:00
parent 34425870b8 081b865936
commit 30b4a45998
14 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_show.cc
View File

@ -2171,7 +2171,7 @@ LEX_STRING *make_lex_string(THD *thd, LEX_STRING *lex_str,
/* INFORMATION_SCHEMA name */
LEX_STRING information_schema_name= {(char*)"information_schema", 18};
LEX_STRING information_schema_name= { C_STRING_WITH_LEN("information_schema")};
/* This is only used internally, but we need it here as a forward reference */
extern ST_SCHEMA_TABLE schema_tables[];
@ -3214,10 +3214,10 @@ static my_bool iter_schema_engines(THD *thd, st_plugin_int *plugin,
if (!(wild && wild[0] &&
wild_case_compare(scs, plugin->name.str,wild)))
{
LEX_STRING state[2]= {{(char*) STRING_WITH_LEN("ENABLED")},
{(char*) STRING_WITH_LEN("DISABLED")}};
LEX_STRING yesno[2]= {{(char*) STRING_WITH_LEN("NO")},
{(char*) STRING_WITH_LEN("YES")}};
LEX_STRING state[2]= {{ C_STRING_WITH_LEN("ENABLED") },
{ C_STRING_WITH_LEN("DISABLED") }};
LEX_STRING yesno[2]= {{ C_STRING_WITH_LEN("NO") },
{ C_STRING_WITH_LEN("YES") }};
LEX_STRING *tmp;
restore_record(table, s->default_values);