diff options
| author | unknown <monty@butch.> | 2002-11-07 12:49:01 +0200 |
|---|---|---|
| committer | unknown <monty@butch.> | 2002-11-07 12:49:01 +0200 |
| commit | 8d0d518ceda975ba53f2cc94b01250f642ae6f11 (patch) | |
| tree | 735a853cc51cb8bebe0ea3e7c79b1a381088f96d /sql/sql_insert.cc | |
| parent | 4060f083076dcac09a37148d2f733b33fa825f2b (diff) | |
| parent | c88b91020866b1505404157c76c56cbb92410ec5 (diff) | |
| download | mariadb-git-8d0d518ceda975ba53f2cc94b01250f642ae6f11.tar.gz | |
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
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 81178809f8f..7a8ad1fd3e6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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; |