Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime sql/sql_parse.cc: Manual merge.
This commit is contained in:
commit
d3c6816362
@ -1391,7 +1391,7 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
|
||||
LEX_STRING db;
|
||||
size_t dummy;
|
||||
if (lex->select_lex.db == NULL &&
|
||||
thd->copy_db_to(&lex->select_lex.db, &dummy))
|
||||
lex->copy_db_to(&lex->select_lex.db, &dummy))
|
||||
{
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user