diff options
| author | serg@sergbook.mysql.com <> | 2007-04-16 10:37:50 +0200 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2007-04-16 10:37:50 +0200 |
| commit | 6bc9bc92df57f1cc586e2223e23c0e94003fa7eb (patch) | |
| tree | df4c92bcf5668ec88685604378ad6dc60bfcf269 /include/mysql.h | |
| parent | 3f72507d0d9e935b0a6badcf20c0dbff06860658 (diff) | |
| parent | c53037af36e1e7af2996299fc6f0d126619f2565 (diff) | |
| download | mariadb-git-6bc9bc92df57f1cc586e2223e23c0e94003fa7eb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 33bdf80ef73..f657e1ae64b 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -67,7 +67,6 @@ typedef int my_socket; #include "mysql_version.h" #include "mysql_com.h" #include "mysql_time.h" -#include "typelib.h" #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */ @@ -126,6 +125,8 @@ typedef unsigned long long my_ulonglong; #endif #endif +#include "typelib.h" + #define MYSQL_COUNT_ERROR (~(my_ulonglong) 0) /* backward compatibility define - to be removed eventually */ |