diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-03-05 10:16:20 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-03-05 10:16:20 +0100 |
| commit | 562aa3b1420181a8bcb3113ccf5f9c8b5b298f51 (patch) | |
| tree | 0cdc94a6e902ea71bc40c9e08dec840ea3136091 /sql/sql_update.cc | |
| parent | 0b7706c9cf26ff648fab381336f3bd6d6da16ab6 (diff) | |
| parent | 33fafa96ca618f3b6e5a4b546569f6aa9c2690c4 (diff) | |
| download | mariadb-git-562aa3b1420181a8bcb3113ccf5f9c8b5b298f51.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/handler.cc:
Manual merge.
sql/sql_update.cc:
Manual merge.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 7c9ead7591c..eae755ca87a 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1192,7 +1192,7 @@ multi_update::multi_update(TABLE_LIST *table_list, tmp_tables(0), updated(0), found(0), fields(field_list), values(value_list), table_count(0), copy_field(0), handle_duplicates(handle_duplicates_arg), do_update(1), trans_safe(1), - transactional_tables(1), ignore(ignore_arg), error_handled(0) + transactional_tables(0), ignore(ignore_arg), error_handled(0) {} |