mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge
configure.in: Auto merged sql/field.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/item_func.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged
This commit is contained in:
@ -25,7 +25,7 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list);
|
||||
static int write_delayed(THD *thd,TABLE *table, enum_duplicates dup,
|
||||
char *query, uint query_length, bool log_on);
|
||||
static void end_delayed_insert(THD *thd);
|
||||
static pthread_handler_decl(handle_delayed_insert,arg);
|
||||
extern "C" static pthread_handler_decl(handle_delayed_insert,arg);
|
||||
static void unlink_blobs(register TABLE *table);
|
||||
|
||||
/* Define to force use of my_malloc() if the allocated memory block is big */
|
||||
@ -915,7 +915,7 @@ void kill_delayed_threads(void)
|
||||
* Create a new delayed insert thread
|
||||
*/
|
||||
|
||||
static pthread_handler_decl(handle_delayed_insert,arg)
|
||||
extern "C" static pthread_handler_decl(handle_delayed_insert,arg)
|
||||
{
|
||||
delayed_insert *di=(delayed_insert*) arg;
|
||||
THD *thd= &di->thd;
|
||||
|
Reference in New Issue
Block a user