diff options
| author | unknown <gbichot@dl145h.mysql.com> | 2007-02-23 15:32:51 +0100 |
|---|---|---|
| committer | unknown <gbichot@dl145h.mysql.com> | 2007-02-23 15:32:51 +0100 |
| commit | 8c07265ce1444b0c6cf0d6938ef934ae7c9f8587 (patch) | |
| tree | 9305f076f77225fc1f7e0208136f78fb2e007126 /mysql-test/t/disabled.def | |
| parent | 9dfb1d9011cf5b31d139d3904a0bf3afae91ad24 (diff) | |
| download | mariadb-git-8c07265ce1444b0c6cf0d6938ef934ae7c9f8587.tar.gz | |
the fix for BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
didn't make it into 5.0.36 and 5.1.16,
so we need to adjust the bug-detection-based-on-version-number code.
Because the rpl tree has a too old version, rpl_insert_id cannot pass,
so I disable it (like is already the case in 5.1-rpl for the same reason),
and the repl team will re-enable it when they merge 5.0 and 5.1 into
their trees (thus getting the right version number).
mysql-test/t/disabled.def:
rpl_insert_id tests statement-based replication of INSERT ON
DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
fixed in 5.0.38; we made the slave detect if it is connected to a
<5.0.38 master and if so refuse to replicate.
The problem is that this 5.0-rpl tree, even though it will produce
the 5.0.38 release, still has a 5.0.36 version in configure.in.
Thus rpl_insert_id fails. So I disable it. As soon as the 5.0-rpl
tree gets the changesets from the main 5.0, its version will change
to 5.0.38 and so the repl team will re-enable the test.
sql/slave.cc:
the fix for BUG#24432 didn't make it into 5.0.36 and 5.1.16,
so we need to adjust the bug-detection-based-on-version-number code.
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 3213bd4eb5b..1464ddaa6b0 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -14,4 +14,5 @@ im_daemon_life_cycle : Bug#24415 see note: [19 Dec 23:17] Trudy Pelzer ndb_load : Bug#17233 user_limits : Bug#23921 random failure of user_limits.test flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin +rpl_insert_id : replication team will enable as soon as they merge their tree with main tree and so got version number 5.0.38 |