database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merging into mysql-5.5.16-release.

Browse Source
This commit is contained in:
Mats Kindahl
2011-08-15 20:12:11 +02:00
parent cfb4a7c2ff
commit cf5e5f837a
31 changed files with 141 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysql/plugin_ftparser.h.pp
View File

@ -43,7 +43,7 @@ typedef enum _thd_wait_type_e {
THD_WAIT_BINLOG= 8,
THD_WAIT_GROUP_COMMIT= 9,
THD_WAIT_SYNC= 10,
THD_WAIT_LAST= 11
THD_WAIT_LAST= 11
} thd_wait_type;
extern struct thd_wait_service_st {
void (*thd_wait_begin_func)(void*, int);
@ -101,6 +101,7 @@ struct st_mysql_plugin
struct st_mysql_show_var *status_vars;
struct st_mysql_sys_var **system_vars;
void * __reserved1;
unsigned long flags;
};
#include "plugin_ftparser.h"
struct st_mysql_daemon