diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:24:33 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:24:33 +0300 |
| commit | 1375821c8d15a4a34aea697db534ac5a0407d699 (patch) | |
| tree | d8b5c28f76c34297cb383870257e988a7f1b8de7 /sql/sql_db.cc | |
| parent | fa3f3beadcb8efd07a87ee32a8e52dde071d5ad1 (diff) | |
| parent | ed79d2ecbbb6b88d328dd32cba3e53051744e9dc (diff) | |
| download | mariadb-git-1375821c8d15a4a34aea697db534ac5a0407d699.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/events.cc
- sql/mysql_priv.h
- sql/repl_failsafe.cc
- sql/sql_db.cc
- sql/sql_parse.cc
- sql/sql_show.cc
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index fe38afb0521..6713a8f58f8 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -645,7 +645,7 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, DBUG_ENTER("mysql_create_db"); /* do not create 'information_schema' db */ - if (is_infoschema_db(db, strlen(db))) + if (is_infoschema_db(db)) { my_error(ER_DB_CREATE_EXISTS, MYF(0), db); DBUG_RETURN(-1); |