diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-30 16:51:35 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-30 16:51:35 +0200 |
| commit | c3d473abc07a8466eb872dd0885f2e8e621be5ff (patch) | |
| tree | 9cce03ab8d14782cf899fc82026a2d6db6baff6f /sql/sql_db.cc | |
| parent | 39ba8376e6a3331a2c75fb3f9f5fbd6ff42f6a62 (diff) | |
| parent | b4f41433e6d26785f2090db6953469aff495b440 (diff) | |
| download | mariadb-git-c3d473abc07a8466eb872dd0885f2e8e621be5ff.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index d89800e34f8..a5dabc8140c 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -440,7 +440,8 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db); error= 0; - send_ok(thd); + if (!silent) + send_ok(thd); goto exit; } else |