Commit 9fe46901 authored by Marko Mäkelä's avatar Marko Mäkelä

Do not test non-instant ADD COLUMN for ROW_FORMAT=COMPRESSED

parent 47988df7
846c846
< SPATIAL INDEX(c3)) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> SPATIAL INDEX(c3)) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
950c950
< ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
---
> ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
972c972
< ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
---
> ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
988c988
< ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
1015c1015
< ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
1086c1086
< ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
846c846
< SPATIAL INDEX(c3)) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> SPATIAL INDEX(c3)) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
950c950
< ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
---
> ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
972c972
< ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
---
> ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
988c988
< ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
1015c1015
< ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
1086c1086
< ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
---
> ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
......@@ -4,16 +4,21 @@
--echo # MDEV-11369: Instant ADD COLUMN for InnoDB
--echo #
# FIXME: Test that instant ADD is not allowed on ROW_FORMAT=COMPRESSED
# (create a table with SPATIAL INDEX, ROW_FORMAT=COMPACT, and
# show that ALTER TABLE…ADD COLUMN…LOCK=NONE is refused.
# This does not work yet for any table, because
# check_if_supported_inplace_alter()
# does not check if instant ADD is possible.)
SET timestamp = 42;
SET time_zone='+03:00';
let $format= 4;
let $format= 3;
while ($format) {
let $engine= `SELECT CONCAT('ENGINE=InnoDB ROW_FORMAT=',CASE $format
WHEN 1 THEN CASE WHEN @@GLOBAL.innodb_page_size>16384
THEN 'DYNAMIC' ELSE 'COMPRESSED' END
WHEN 2 THEN 'DYNAMIC'
WHEN 3 THEN 'COMPACT'
WHEN 1 THEN 'DYNAMIC'
WHEN 2 THEN 'COMPACT'
ELSE 'REDUNDANT' END)`;
eval CREATE TABLE t1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment