diff options
| author | unknown <msvensson@devsrv-b.mysql.com> | 2006-01-31 15:14:46 +0100 |
|---|---|---|
| committer | unknown <msvensson@devsrv-b.mysql.com> | 2006-01-31 15:14:46 +0100 |
| commit | 1a53ee1a6529decea4f9157fa02ef59f6e28d6f4 (patch) | |
| tree | c87d5348372c3d8192fe9e0190b6c2b0682fb2bc /sql/sql_db.cc | |
| parent | 5dda41a7170b3d46a8059d006333b44152b55de8 (diff) | |
| parent | b498114fbad92323e3cdbdc1395110e70dd3f0f8 (diff) | |
| download | mariadb-git-1a53ee1a6529decea4f9157fa02ef59f6e28d6f4.tar.gz | |
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302
into devsrv-b.mysql.com:/space/magnus/my50-bug15302
client/mysqltest.c:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 1e547d77b11..357d2d5a21f 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -395,6 +395,12 @@ err1: silent Used by replication when internally creating a database. 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 FALSE ok TRUE Error @@ -435,17 +441,17 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, if (my_stat(path,&stat_info,MYF(0))) { - if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS)) + if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS)) { my_error(ER_DB_CREATE_EXISTS, MYF(0), db); error= -1; goto exit; } push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, - ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db); - error= 0; + ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db); if (!silent) send_ok(thd); + error= 0; goto exit; } else |