diff options
| author | Martin Hansson <mhansson@mysql.com> | 2009-05-05 11:38:19 +0200 |
|---|---|---|
| committer | Martin Hansson <mhansson@mysql.com> | 2009-05-05 11:38:19 +0200 |
| commit | 391364fac778621e626c9ffdf7653d2b61690ad3 (patch) | |
| tree | 432a1d7e25b477fe9f283a886845c37bd86cfeb5 /mysql-test/suite | |
| parent | e0526914b6acb91f8cf15bd536ad40e226158d1b (diff) | |
| download | mariadb-git-391364fac778621e626c9ffdf7653d2b61690ad3.tar.gz | |
Bug#43580: Issue with Innodb on multi-table update
Certain multi-updates gave different results on InnoDB from
to MyISAM, due to on-the-fly updates being used on the former and
the update order matters.
Fixed by turning off on-the-fly updates when update order
dependencies are present.
mysql-test/r/innodb_mysql.result:
Bug#43580: Test result.
mysql-test/suite/rpl/r/rpl_slave_skip.result:
Bug#43580: Changed test result. The InnoDB result is now what it would have been on MyISAM.
mysql-test/t/innodb_mysql.test:
Bug#43580: Test case.
sql/sql_base.cc:
Bug#43580: Added a word of caution about using tmp_set here.
sql/sql_update.cc:
Bug#43580: Fix.
Calls to TABLE::mark_columns_needed_for_update() are moved
from mysql_multi_update_prepare() and right before the decison
to do on-the-fly updates to the place where we do (or don't do)
on-the-fly updates.
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_slave_skip.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result index 747e8f235a8..93b3e124a01 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result @@ -39,8 +39,8 @@ a b SELECT * FROM t2; c d 1 2 -2 16 -3 54 +2 8 +3 18 **** On Slave **** START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762; SHOW SLAVE STATUS; @@ -50,7 +50,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 1133 +Read_Master_Log_Pos 1115 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 |