diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-21 17:48:28 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-21 17:48:28 +0200 |
| commit | 515ba6be6f7dde86d9a82b1f7ba3d86f62b24f0e (patch) | |
| tree | 4f0c113cf15f0425c7fedd53da1c81aa881a00ea /include/config-win.h | |
| parent | 581af6849751616d8cdccf10ae106d59ec542bac (diff) | |
| parent | d4efe0684b12fb0fd2b1f615ffd4cf26723eba06 (diff) | |
| download | mariadb-git-515ba6be6f7dde86d9a82b1f7ba3d86f62b24f0e.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
CMakeLists.txt:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
sql/procedure.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/handler.h:
merged bug 26461 to 5.1-opt
sql/mysql_priv.h:
merged bug 26461 to 5.1-opt
sql/sql_base.cc:
merged bug 26461 to 5.1-opt
sql/sql_prepare.cc:
merged bug 26461 to 5.1-opt
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/config-win.h b/include/config-win.h index e0558ca4564..a53332a9c2e 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -158,14 +158,12 @@ typedef uint rf_SetTimer; #define Socket_defined #define my_socket SOCKET -#define bool BOOL #define SIGPIPE SIGINT #define RETQSORTTYPE void #define QSORT_TYPE_IS_VOID #define RETSIGTYPE void #define SOCKET_SIZE_TYPE int #define my_socket_defined -#define bool_defined #define byte_defined #define HUGE_PTR #define STDCALL __stdcall /* Used by libmysql.dll */ @@ -472,4 +470,4 @@ inline double ulonglong2double(ulonglong value) #define HAVE_CHARSET_ujis 1 #define HAVE_CHARSET_utf8 1 #define HAVE_UCA_COLLATIONS 1 - +#define HAVE_BOOL 1 |