diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-16 23:38:55 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-16 23:38:55 +0400 |
| commit | d3c68163627b8ff14694cf223f0690766a7322e6 (patch) | |
| tree | 19ac94b0664ca01bcb769cef946e232a4aff600a /sql/sql_parse.cc | |
| parent | 9562c54a5c1172fa536d27bb67e86d7af93183d8 (diff) | |
| parent | de2089264fcafa7f850c73382200ed1d5d91fdef (diff) | |
| download | mariadb-git-d3c68163627b8ff14694cf223f0690766a7322e6.tar.gz | |
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.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 10ecb086730..f2a61b7f7c5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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); } |