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

compiler warnings

This commit is contained in:
Sergei Golubchik
2013-04-15 11:19:39 +02:00
parent 665a31af2b
commit 30b2c64c4e

View File

@ -7837,16 +7837,22 @@ int make_schema_select(THD *thd, SELECT_LEX *sel,
We have to make non const db_name & table_name
because of lower_case_table_names
*/
thd->make_lex_string(&db, INFORMATION_SCHEMA_NAME.str,
INFORMATION_SCHEMA_NAME.length);
thd->make_lex_string(&table, schema_table->table_name,
strlen(schema_table->table_name));
if (schema_table->old_format(thd, schema_table) || /* Handle old syntax */
!sel->add_table_to_list(thd, new Table_ident(thd, db, table, 0),
0, 0, TL_READ, MDL_SHARED_READ))
{
if (!thd->make_lex_string(&db, INFORMATION_SCHEMA_NAME.str,
INFORMATION_SCHEMA_NAME.length))
DBUG_RETURN(1);
}
if (!thd->make_lex_string(&table, schema_table->table_name,
strlen(schema_table->table_name)))
DBUG_RETURN(1);
if (schema_table->old_format(thd, schema_table))
DBUG_RETURN(1);
if (!sel->add_table_to_list(thd, new Table_ident(thd, db, table, 0),
0, 0, TL_READ, MDL_SHARED_READ))
DBUG_RETURN(1);
DBUG_RETURN(0);
}