mirror of
https://github.com/MariaDB/server.git
synced 2025-08-05 13:16:09 +03:00
Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint include/mysql.h: Auto merged
This commit is contained in:
@@ -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' */
|
||||
|
Reference in New Issue
Block a user