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

into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
This commit is contained in:
jpipes@shakedown.(none) 2006-12-07 08:52:59 -05:00
commit a6ad0c3000

View file

@ -65,9 +65,9 @@ typedef int my_socket;
#endif /* my_socket_defined */
#endif /* _global_h */
#include "mysql_version.h"
#include "mysql_com.h"
#include "mysql_time.h"
#include "mysql_version.h"
#include "typelib.h"
#include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */