Correct a merge error.

752972b5 · kostja@vajra.(none) · e1218d0e · 752972b5
Commit 752972b5 authored May 16, 2007 by kostja@vajra.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sql/sql_insert.cc sql/sql_insert.cc +3 -3

No files found.
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -64,7 +64,7 @@
 #ifndef EMBEDDED_LIBRARY
 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);
 static void end_delayed_insert(THD *thd);
 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 */
 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_insert *di=thd->di;