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

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

Browse Source 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/sql_parse.cc:
  Manual merge.
This commit is contained in:
unknown 2007-07-16 23:38:55 +04:00
commit d3c6816362
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -1391,7 +1391,7 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
LEX_STRING db; LEX_STRING db;
size_t dummy; size_t dummy;
if (lex->select_lex.db == NULL && 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); DBUG_RETURN(1);
} }