Commit b498114f authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302

into  neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302


client/mysqltest.c:
  Already in 5.0
sql/sql_db.cc:
  "mysql_create_db" is already silent in 5.0
parents db5fe0fc c35be281
...@@ -391,6 +391,12 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create) ...@@ -391,6 +391,12 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
silent Used by replication when internally creating a database. silent Used by replication when internally creating a database.
In this case the entry should not be logged. In this case the entry should not be logged.
SIDE-EFFECTS
1. Report back to client that command succeeded (send_ok)
2. Report errors to client
3. Log event to binary log
(The 'silent' flags turns off 1 and 3.)
RETURN VALUES RETURN VALUES
FALSE ok FALSE ok
TRUE Error TRUE Error
...@@ -439,9 +445,9 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, ...@@ -439,9 +445,9 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
} }
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db); ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
error= 0;
if (!silent) if (!silent)
send_ok(thd); send_ok(thd);
error= 0;
goto exit; goto exit;
} }
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment