summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorgshchepa/uchum@gleb.loc <>2007-08-31 16:59:07 +0500
committergshchepa/uchum@gleb.loc <>2007-08-31 16:59:07 +0500
commit3e49bbd8e7319e6ce0e76465b05b2f542cda69a1 (patch)
treec9ca0c7e92c4c979b542002264f72e5f0e880220 /sql/sql_parse.cc
parentc70dbeab8b5668d2d2abc6adec7117b4fada943d (diff)
downloadmariadb-git-3e49bbd8e7319e6ce0e76465b05b2f542cda69a1.tar.gz
Fixed bug #30126.
When dumping database from a 4.x server, the mysqldump client inserted a delimiter sign inside special commentaries of the form: /*!... CREATE DATABASE IF NOT EXISTS ... ;*/ During restoration that dump file was splitten by delimiter signs on the client side, and the rest of some commentary strings was prepended to following statements. The 4x_server_emul test case option has been added for use with the DBUG_EXECUTE_IF debugging macro. This option affects debug server builds only to emulate particular behavior of a 4.x server for the mysqldump client testing. Non-debugging builds are not affected.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 58f5ffc5235..bb3ab9a67fe 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3990,6 +3990,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 (!strip_sp(lex->name) || check_db_name(lex->name))
{
my_error(ER_WRONG_DB_NAME, MYF(0), lex->name);