diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
| commit | 95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1 (patch) | |
| tree | 20f91c9dfc995df26363073737c34e8fe565bfe6 /mysql-test/suite/versioning | |
| parent | ae1d17f52de045b37e0894e1e6684a911a43696c (diff) | |
| parent | 43882e764d6867c6855b1ff057758a3f08b25c55 (diff) | |
| download | mariadb-git-95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1.tar.gz | |
Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4
Diffstat (limited to 'mysql-test/suite/versioning')
| -rw-r--r-- | mysql-test/suite/versioning/r/online.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/trx_id.result | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/versioning/r/online.result b/mysql-test/suite/versioning/r/online.result index 41a2556628a..36251ddd550 100644 --- a/mysql-test/suite/versioning/r/online.result +++ b/mysql-test/suite/versioning/r/online.result @@ -66,7 +66,9 @@ alter table t2 change a a int with system versioning, add primary key pk (a); affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 0 +info: Records: 0 Duplicates: 0 Warnings: 1 +Warnings: +Warning 1280 Name 'pk' ignored for PRIMARY key. # restart update t1 set a=2; select count(*) from t1 for system_time all; diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result index 333b8b3efa0..5d4669c46e2 100644 --- a/mysql-test/suite/versioning/r/trx_id.result +++ b/mysql-test/suite/versioning/r/trx_id.result @@ -437,7 +437,9 @@ ALTER TABLE t CHANGE a a INT WITH SYSTEM VERSIONING, ADD PRIMARY KEY pk(a); affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 0 +info: Records: 0 Duplicates: 0 Warnings: 1 +Warnings: +Warning 1280 Name 'pk' ignored for PRIMARY key. SELECT c.prtype FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS AS c INNER JOIN INFORMATION_SCHEMA.INNODB_SYS_TABLES AS t ON c.table_id=t.table_id |