diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-11-10 13:08:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-11-10 13:08:42 +0200 |
| commit | ee25adb94527f862af18342d231ce18964e159f3 (patch) | |
| tree | 9367f2f843d6f9ddc9a142d72ba5b68a9d1c8ae4 /sql/sql_insert.cc | |
| parent | 9499e2da7119889f8955270a9631797f808fbe75 (diff) | |
| parent | d7946a908f9ad760e1b7a21aa330b71615ce4702 (diff) | |
| download | mariadb-git-ee25adb94527f862af18342d231ce18964e159f3.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index eaf7f4c895b..c061a3f472c 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -77,6 +77,8 @@ #include "transaction.h" #include "sql_audit.h" +#include "debug_sync.h" + #ifndef EMBEDDED_LIBRARY static bool delayed_get_table(THD *thd, MDL_request *grl_protection_request, TABLE_LIST *table_list); @@ -1541,6 +1543,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) error= HA_ERR_FOUND_DUPP_KEY; /* Database can't find key */ goto err; } + DEBUG_SYNC(thd, "write_row_replace"); + /* Read all columns for the row we are going to replace */ table->use_all_columns(); /* @@ -1729,6 +1733,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) } else if ((error=table->file->ha_write_row(table->record[0]))) { + DEBUG_SYNC(thd, "write_row_noreplace"); if (!info->ignore || table->file->is_fatal_error(error, HA_CHECK_DUP)) goto err; |