summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorgkodinov/kgeorge@macbook.gmz <>2008-03-21 17:23:17 +0200
committergkodinov/kgeorge@macbook.gmz <>2008-03-21 17:23:17 +0200
commitff0aac178d8092cc78f77d332b1a68f4100e282c (patch)
treed2f43f2618b402fbb8989716aacea8b5cb8eb442 /sql/sql_db.cc
parent3bff5b59c669fa14645fb4705b2406bd2ba0e120 (diff)
downloadmariadb-git-ff0aac178d8092cc78f77d332b1a68f4100e282c.tar.gz
Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)
The bool data type was redefined to BOOL (4 bytes on windows). Removed the #define and fixed some of the warnings that were uncovered by this. Note that the fix also disables 2 warnings : 4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning) 4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation These warnings will be handled in a separate bug, as they are performance related or bogus. Fixed to int the return type of functions that return more than 2 distinct values.
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 91b0c02d23b..e25ede1be03 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -449,7 +449,7 @@ bool load_db_opt_by_name(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];