database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

MDEV-20949: Merge 10.2 into 10.3

Browse Source 
In the test innodb.instant_alter,4k we would be flagging an error
for too large row size. That error was previously only being reported
if the table was being rebuilt. Thus, this merge is fixing a small
omission in MDEV-11369 (instant ADD COLUMN).
This commit is contained in:
Marko Mäkelä
2019-11-14 11:26:49 +02:00
parent bc5cfe7769 98694ab0cb
commit 4ded5fb9ac
16 changed files with 383 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/innodb/t/instant_alter.test
View File

@@ -46,6 +46,7 @@ SET @old_instant=
WHERE variable_name = 'innodb_instant_alter_column');
let $format= 3;
let $redundant_4k= `SELECT @@GLOBAL.innodb_page_size=4096`;
while ($format) {
let $engine= `SELECT CONCAT('ENGINE=InnoDB ROW_FORMAT=',CASE $format
WHEN 1 THEN 'DYNAMIC'
@@ -223,6 +224,13 @@ SELECT id, c2, ST_AsText(c3) c3, c4, c5, c6, c7, c8 FROM t3;
--enable_info
ALTER TABLE t3 ADD COLUMN t TEXT CHARSET utf8
DEFAULT 'The quick brown fox jumps over the lazy dog';
if ($redundant_4k)
{
--error ER_TOO_BIG_ROWSIZE
ALTER TABLE t3 ADD COLUMN b BLOB NOT NULL;
SET innodb_strict_mode = OFF;
}
ALTER TABLE t3 ADD COLUMN b BLOB NOT NULL;
--error ER_NO_DEFAULT_FOR_FIELD
INSERT INTO t3 SET id=4;
@@ -236,7 +244,6 @@ INSERT INTO t3 SET id=5, c2=9;
SELECT id, c2, ST_AsText(c3) c3, c4, c5, c6, c7, c8, phrase, b FROM t3;
--enable_info
ALTER TABLE t3 DROP c3, DROP c7;
SET innodb_strict_mode = OFF;
--disable_info
SELECT * FROM t3;
@@ -390,6 +397,7 @@ CHECK TABLE t1;
DROP TABLE t1;
dec $format;
let $redundant_4k= 0;
}
disconnect analyze;
SELECT variable_value-@old_instant instants