summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authortnurnberg@white.intern.koehntopp.de <>2008-03-27 23:34:12 +0100
committertnurnberg@white.intern.koehntopp.de <>2008-03-27 23:34:12 +0100
commita3df2a4cf4e0af82695378189e2f17d4b89078fd (patch)
tree432acab1ed6fe07e9087cf7577c8910fcfbb6900 /sql/sql_db.cc
parentfe0bff70e0d7b2cb52b95c315eb7e3976dbb4e74 (diff)
parent02235ace7b3d3aeac9826f479612ea7eca95ca61 (diff)
downloadmariadb-git-a3df2a4cf4e0af82695378189e2f17d4b89078fd.tar.gz
Merge mysql.com:/misc/mysql/mysql-5.1
into mysql.com:/misc/mysql/mysql-5.1-opt
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 75f9f5e847d..2c7e0e82b3c 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -606,7 +606,7 @@ CHARSET_INFO *get_default_db_collation(THD *thd, const char *db_name)
*/
-bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
+int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
bool silent)
{
char path[FN_REFLEN+16];