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

Correct a merge error.

Browse Source
This commit is contained in:
kostja@vajra.(none)
2007-05-16 10:32:47 +04:00
parent e1218d0e75
commit 752972b570
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_insert.cc
View File

@@ -64,7 +64,7 @@
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
static bool delayed_get_table(THD *thd, TABLE_LIST *table_list); static bool delayed_get_table(THD *thd, TABLE_LIST *table_list);
static int write_delayed(THD *thd, TABLE *table, enum_duplicates dup, static int write_delayed(THD *thd, TABLE *table, enum_duplicates duplic,
LEX_STRING query, bool ignore, bool log_on); LEX_STRING query, bool ignore, bool log_on);
static void end_delayed_insert(THD *thd); static void end_delayed_insert(THD *thd);
pthread_handler_t handle_delayed_insert(void *arg); pthread_handler_t handle_delayed_insert(void *arg);
@@ -1999,8 +1999,8 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
/* Put a question in queue */ /* Put a question in queue */
static static
int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic, bool ignore, int write_delayed(THD *thd, TABLE *table, enum_duplicates duplic,
char *query, uint query_length, bool log_on) LEX_STRING query, bool ignore, bool log_on)
{ {
delayed_row *row= 0; delayed_row *row= 0;
Delayed_insert *di=thd->di; Delayed_insert *di=thd->di;