diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-31 17:50:52 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-31 17:50:52 +0500 |
| commit | 035e516af1dac82b97bf63b56a5f45c4afdcaa98 (patch) | |
| tree | 0f79bc772675b0be500ed51195feda5754646251 /sql/sql_parse.cc | |
| parent | 55335f0dd2c46984b9295883c0b77e0e3053a6eb (diff) | |
| parent | ff149b713cc8fef67a6b25945efa8e4f4f65bcdb (diff) | |
| download | mariadb-git-035e516af1dac82b97bf63b56a5f45c4afdcaa98.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126
into gleb.loc:/home/uchum/work/bk/5.1-opt
client/mysqldump.c:
Auto merged
sql/sql_parse.cc:
SCCS merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 39f4998daf0..a16343aeb13 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3259,6 +3259,8 @@ end_with_restore_list: } case SQLCOM_SHOW_CREATE_DB: { + DBUG_EXECUTE_IF("4x_server_emul", + my_error(ER_UNKNOWN_ERROR, MYF(0)); goto error;); if (check_db_name(&lex->name)) { my_error(ER_WRONG_DB_NAME, MYF(0), lex->name.str); |