Commit 5ed226e8 authored by unknown's avatar unknown

Merge jpipes@bk-internal:/home/bk/mysql-5.0-maint

into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
parents 1e8739c3 938bb231
...@@ -65,9 +65,9 @@ typedef int my_socket; ...@@ -65,9 +65,9 @@ typedef int my_socket;
#endif /* my_socket_defined */ #endif /* my_socket_defined */
#endif /* _global_h */ #endif /* _global_h */
#include "mysql_version.h"
#include "mysql_com.h" #include "mysql_com.h"
#include "mysql_time.h" #include "mysql_time.h"
#include "mysql_version.h"
#include "typelib.h" #include "typelib.h"
#include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */ #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment