diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-01-21 14:27:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-01-22 08:04:53 +0400 |
| commit | daf28db027a8bdcb7b2b69c54639fec35a2dd259 (patch) | |
| tree | 7caff6125234c89859c50163550fe10f4c6b6796 /mysql-test/suite/innodb_i_s/innodb_locks.result | |
| parent | c20bf8fd494edd4e4931557395b8a2bdf6cc48ab (diff) | |
| download | mariadb-git-daf28db027a8bdcb7b2b69c54639fec35a2dd259.tar.gz | |
MDEV-21537 InnoDB INFORMATION_SCHEMA tables fail to define DEFAULT for ENUM NOT NULL
- Adding a way to define I_S columns without DEFAULT.
- Fixing all ENUM columns in I_S.INNODB* table definitions to have no DEFAULT.
Diffstat (limited to 'mysql-test/suite/innodb_i_s/innodb_locks.result')
| -rw-r--r-- | mysql-test/suite/innodb_i_s/innodb_locks.result | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb_i_s/innodb_locks.result b/mysql-test/suite/innodb_i_s/innodb_locks.result index abfdce08606..6811a968869 100644 --- a/mysql-test/suite/innodb_i_s/innodb_locks.result +++ b/mysql-test/suite/innodb_i_s/innodb_locks.result @@ -3,8 +3,8 @@ Table Create Table INNODB_LOCKS CREATE TEMPORARY TABLE `INNODB_LOCKS` ( `lock_id` varchar(81) NOT NULL DEFAULT '', `lock_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0, - `lock_mode` enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC') NOT NULL DEFAULT '', - `lock_type` enum('RECORD','TABLE') NOT NULL DEFAULT '', + `lock_mode` enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC') NOT NULL, + `lock_type` enum('RECORD','TABLE') NOT NULL, `lock_table` varchar(1024) NOT NULL DEFAULT '', `lock_index` varchar(1024) DEFAULT NULL, `lock_space` int(11) unsigned DEFAULT NULL, @@ -12,3 +12,7 @@ INNODB_LOCKS CREATE TEMPORARY TABLE `INNODB_LOCKS` ( `lock_rec` int(11) unsigned DEFAULT NULL, `lock_data` varchar(8192) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 +CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_LOCKS; +DROP TEMPORARY TABLE t1; +CREATE TEMPORARY TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS LIMIT 0; +DROP TEMPORARY TABLE t1; |