diff options
| author | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
| commit | 08e4635fbabb4a4bea3a9b44057a2cd9b12d580f (patch) | |
| tree | 9de56c7859229fc3e173370d434fb24e1a367a1d /sql/sql_update.cc | |
| parent | e4e1ae0d13da399d53bd91df791b149f3eae796b (diff) | |
| parent | 27f4f67bd2f35bf710f1a4e4ddde0e42738a195d (diff) | |
| download | mariadb-git-08e4635fbabb4a4bea3a9b44057a2cd9b12d580f.tar.gz | |
merge 5.1-> 5.2
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 6ded059b59f..a983e64c01d 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -810,7 +810,7 @@ int mysql_update(THD *thd, errcode= query_error_code(thd, killed_status == THD::NOT_KILLED); if (thd->binlog_query(THD::ROW_QUERY_TYPE, - thd->query, thd->query_length, + thd->query(), thd->query_length(), transactional_table, FALSE, errcode)) { error=1; // Rollback update @@ -1696,6 +1696,11 @@ bool multi_update::send_data(List<Item> ¬_used_values) TRG_EVENT_UPDATE)) DBUG_RETURN(1); + /* + Reset the table->auto_increment_field_not_null as it is valid for + only one row. + */ + table->auto_increment_field_not_null= FALSE; found++; if (!can_compare_record || compare_record(table)) { @@ -1860,7 +1865,7 @@ void multi_update::abort() */ int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED); thd->binlog_query(THD::ROW_QUERY_TYPE, - thd->query, thd->query_length, + thd->query(), thd->query_length(), transactional_tables, FALSE, errcode); } thd->transaction.all.modified_non_trans_table= TRUE; @@ -2093,7 +2098,7 @@ bool multi_update::send_eof() else errcode= query_error_code(thd, killed_status == THD::NOT_KILLED); if (thd->binlog_query(THD::ROW_QUERY_TYPE, - thd->query, thd->query_length, + thd->query(), thd->query_length(), transactional_tables, FALSE, errcode)) { local_error= 1; // Rollback update |