diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-30 21:18:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-30 21:26:53 +0200 |
| commit | 921c5e931452301a09c84c53ffe35b81e6a1c71a (patch) | |
| tree | 4ff02c83f03590095fd48bf2d36b11077f752c49 /mysql-test/suite/versioning/r | |
| parent | 33714d20658fcc8535c737fd02c64c7070adbac0 (diff) | |
| parent | 0c1f22061177fab63274a4429e38a4652964d7b8 (diff) | |
| download | mariadb-git-921c5e931452301a09c84c53ffe35b81e6a1c71a.tar.gz | |
Merge bb-10.2-ext into 10.3
MDEV-11415 Remove excessive undo logging during ALTER TABLE…ALGORITHM=COPY
Move a test from innodb.rename_table_debug to innodb.alter_copy.
ha_innobase::extra(HA_EXTRA_BEGIN_ALTER_COPY): Register id-versioned
tables so that mysql.transaction_registry will be updated, even for
empty tables that are subjected to ALTER TABLE…ALGORITHM=COPY.
Diffstat (limited to 'mysql-test/suite/versioning/r')
| -rw-r--r-- | mysql-test/suite/versioning/r/trx_id.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result index a88ba7eec2b..940a6479934 100644 --- a/mysql-test/suite/versioning/r/trx_id.result +++ b/mysql-test/suite/versioning/r/trx_id.result @@ -53,8 +53,8 @@ add column e bigint unsigned as row end, add period for system_time(s, e), add system versioning, algorithm=copy; -select check_result(count(*) = @tmp) from mysql.transaction_registry; -check_result(count(*) = @tmp) +select check_result(count(*) = @tmp + 1) from mysql.transaction_registry; +check_result(count(*) = @tmp + 1) [CORRECT] # TRX_ID to TIMESTAMP versioning switch create or replace table t1 ( |