1 files changed, 48 insertions, 43 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index d590d3b5093..ce64890523a 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -18,7 +18,6 @@
 /* Insert of records */
 
 #include "mysql_priv.h"
-#include "sql_acl.h"
 
 static int check_null_fields(THD *thd,TABLE *entry);
 #ifndef EMBEDDED_LIBRARY
@@ -198,15 +197,6 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
   thd->used_tables=0;
   values= its++;
 
-  if (duplic == DUP_UPDATE && !table->insert_values)
-  {
-    /* it should be allocated before Item::fix_fields() */
-    table->insert_values= 
-      (byte *)alloc_root(thd->mem_root, table->rec_buff_length);
-    if (!table->insert_values)
-      goto abort;
-  }
-
   if (mysql_prepare_insert(thd, table_list, insert_table_list, table,
 			   fields, values, update_fields,
 			   update_values, duplic))
@@ -368,7 +358,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
         if (error <= 0)
           thd->clear_error();
 	Query_log_event qinfo(thd, thd->query, thd->query_length,
-			      log_delayed);
+			      log_delayed, FALSE);
 	if (mysql_bin_log.write(&qinfo) && transactional_table)
 	  error=1;
       }
@@ -449,14 +439,24 @@ int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
 			 enum_duplicates duplic)
 {
   DBUG_ENTER("mysql_prepare_insert");
-  if (check_insert_fields(thd, table, fields, *values, 1) ||
+  if (duplic == DUP_UPDATE && !table->insert_values)
+  {
+    /* it should be allocated before Item::fix_fields() */
+    table->insert_values= 
+      (byte *)alloc_root(thd->mem_root, table->rec_buff_length);
+    if (!table->insert_values)
+      DBUG_RETURN(-1);
+  }
+  if ((values && check_insert_fields(thd, table, fields, *values, 1)) ||
       setup_tables(insert_table_list) ||
-      setup_fields(thd, 0, insert_table_list, *values, 0, 0, 0) ||
+      (values && setup_fields(thd, 0, insert_table_list, *values, 0, 0, 0)) ||
       (duplic == DUP_UPDATE &&
        (setup_fields(thd, 0, insert_table_list, update_fields, 1, 0, 0) ||
         setup_fields(thd, 0, insert_table_list, update_values, 1, 0, 0))))
     DBUG_RETURN(-1);
-  if (find_real_table_in_list(table_list->next, 
+  if ((thd->lex->sql_command==SQLCOM_INSERT ||
+       thd->lex->sql_command==SQLCOM_REPLACE) &&
+      find_real_table_in_list(table_list->next, 
 			      table_list->db, table_list->real_name))
   {
     my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name);
@@ -551,8 +551,10 @@ int write_record(TABLE *table,COPY_INFO *info)
            that matches, is updated. If update causes a conflict again,
            an error is returned
         */
+	DBUG_ASSERT(table->insert_values != NULL);
         store_record(table,insert_values);
         restore_record(table,record[1]);
+	DBUG_ASSERT(info->update_fields->elements==info->update_values->elements);
         if (fill_record(*info->update_fields, *info->update_values, 0))
           goto err;
         if ((error=table->file->update_row(table->record[1],table->record[0])))
@@ -1364,7 +1366,7 @@ bool delayed_insert::handle_inserts(void)
         mysql_update_log.write(&thd,row->query, row->query_length);
       if (row->log_query & DELAYED_LOG_BIN && using_bin_log)
       {
-        Query_log_event qinfo(&thd, row->query, row->query_length,0);
+        Query_log_event qinfo(&thd, row->query, row->query_length,0, FALSE);
         mysql_bin_log.write(&qinfo);
       }
     }
@@ -1457,7 +1459,6 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
 
   restore_record(table,default_values);			// Get empty record
   table->next_number_field=table->found_next_number_field;
-  thd->count_cuted_fields= CHECK_FIELD_WARN;		// calc cuted fields
   thd->cuted_fields=0;
   if (info.handle_duplicates == DUP_IGNORE ||
       info.handle_duplicates == DUP_REPLACE)
@@ -1487,27 +1488,34 @@ select_insert::~select_insert()
 bool select_insert::send_data(List<Item> &values)
 {
   DBUG_ENTER("select_insert::send_data");
+  bool error=0;
   if (unit->offset_limit_cnt)
   {						// using limit offset,count
     unit->offset_limit_cnt--;
     DBUG_RETURN(0);
   }
-  if (fields->elements)
-    fill_record(*fields, values, 1);
-  else
-    fill_record(table->field, values, 1);
-  if (thd->net.report_error || write_record(table,&info))
-    DBUG_RETURN(1);
-  if (table->next_number_field)		// Clear for next record
+  thd->count_cuted_fields= CHECK_FIELD_WARN;		// calc cuted fields
+  store_values(values);
+  error=thd->net.report_error || write_record(table,&info);
+  thd->count_cuted_fields= CHECK_FIELD_IGNORE;
+  if (!error && table->next_number_field)       // Clear for next record
   {
     table->next_number_field->reset();
     if (! last_insert_id && thd->insert_id_used)
       last_insert_id=thd->insert_id();
   }
-  DBUG_RETURN(0);
+  DBUG_RETURN(error);
 }
 
 
+void select_insert::store_values(List<Item> &values)
+{
+  if (fields->elements)
+    fill_record(*fields, values, 1);
+  else
+    fill_record(table->field, values, 1);
+}
+
 void select_insert::send_error(uint errcode,const char *err)
 {
   DBUG_ENTER("select_insert::send_error");
@@ -1539,7 +1547,7 @@ void select_insert::send_error(uint errcode,const char *err)
     if (mysql_bin_log.is_open())
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length,
-                            table->file->has_transactions());
+                            table->file->has_transactions(), FALSE);
       mysql_bin_log.write(&qinfo);
     }
     if (!table->tmp_table)
@@ -1581,7 +1589,7 @@ bool select_insert::send_eof()
     if (!error)
       thd->clear_error();
     Query_log_event qinfo(thd, thd->query, thd->query_length,
-			  table->file->has_transactions());
+			  table->file->has_transactions(), FALSE);
     mysql_bin_log.write(&qinfo);
   }
   if ((error2=ha_autocommit_or_rollback(thd,error)) && ! error)
@@ -1637,7 +1645,6 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   table->next_number_field=table->found_next_number_field;
 
   restore_record(table,default_values);			// Get empty record
-  thd->count_cuted_fields= CHECK_FIELD_WARN;		// count warnings
   thd->cuted_fields=0;
   if (info.handle_duplicates == DUP_IGNORE ||
       info.handle_duplicates == DUP_REPLACE)
@@ -1647,23 +1654,21 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
 }
 
 
-bool select_create::send_data(List<Item> &values)
+void select_create::store_values(List<Item> &values)
 {
-  if (unit->offset_limit_cnt)
-  {						// using limit offset,count
-    unit->offset_limit_cnt--;
-    return 0;
-  }
   fill_record(field, values, 1);
-  if (thd->net.report_error ||write_record(table,&info))
-    return 1;
-  if (table->next_number_field)		// Clear for next record
-  {
-    table->next_number_field->reset();
-    if (! last_insert_id && thd->insert_id_used)
-      last_insert_id=thd->insert_id();
-  }
-  return 0;
+}
+
+
+void select_create::send_error(uint errcode,const char *err)
+{
+  /*
+   Disable binlog, because we "roll back" partial inserts in ::abort
+   by removing the table, even for non-transactional tables.
+  */
+  tmp_disable_binlog(thd);
+  select_insert::send_error(errcode, err);
+  reenable_binlog(thd);
 }
 
 
@@ -1711,7 +1716,7 @@ void select_create::abort()
     enum db_type table_type=table->db_type;
     if (!table->tmp_table)
     {
-      ulong version= table->version;      
+      ulong version= table->version;
       hash_delete(&open_cache,(byte*) table);
       if (!create_info->table_existed)
         quick_rm_table(table_type, db, name);