database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-15115 Assertion failure in CREATE SEQUENCE...ROW_FORMAT=REDUNDANT

Browse Source 
dict_tf_is_valid(): Allow no-rollback tables in ROW_FORMAT=REDUNDANT.
This commit is contained in:
Marko Mäkelä
2018-02-06 17:09:26 +02:00
parent b4db96da58
commit 560b9895d4
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/sql_sequence/create.result
View File

@ -634,3 +634,10 @@ create temporary table s (i int);
drop temporary sequence s; drop temporary sequence s;
ERROR 42S02: Unknown SEQUENCE: 'test.s' ERROR 42S02: Unknown SEQUENCE: 'test.s'
drop table s; drop table s;
#
# MDEV-15115 Assertion failure in CREATE SEQUENCE...ROW_FORMAT=REDUNDANT
#
CREATE SEQUENCE seq1 ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
DROP SEQUENCE seq1;
CREATE TEMPORARY SEQUENCE seq1 ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
DROP TEMPORARY SEQUENCE seq1;

8
mysql-test/suite/sql_sequence/create.test
View File

@ -450,3 +450,11 @@ create temporary table s (i int);
--error ER_UNKNOWN_SEQUENCES --error ER_UNKNOWN_SEQUENCES
drop temporary sequence s; drop temporary sequence s;
drop table s; drop table s;
--echo #
--echo # MDEV-15115 Assertion failure in CREATE SEQUENCE...ROW_FORMAT=REDUNDANT
--echo #
CREATE SEQUENCE seq1 ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
DROP SEQUENCE seq1;
CREATE TEMPORARY SEQUENCE seq1 ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
DROP TEMPORARY SEQUENCE seq1;

2
storage/innobase/include/dict0dict.ic
View File

@ -667,7 +667,7 @@ dict_tf_is_valid(
bit. For ROW_FORMAT=REDUNDANT, only the DATA_DIR flag bit. For ROW_FORMAT=REDUNDANT, only the DATA_DIR flag
(which we cleared above) can be set. If any other flags (which we cleared above) can be set. If any other flags
are set, the flags are invalid. */ are set, the flags are invalid. */
return(flags == 0); return(flags == 0 || flags == DICT_TF_MASK_NO_ROLLBACK);
} }
return(dict_tf_is_valid_not_redundant(flags)); return(dict_tf_is_valid_not_redundant(flags));