diff options
author | Guilhem Bichot <guilhem@mysql.com> | 2009-07-29 10:54:20 +0200 |
---|---|---|
committer | Guilhem Bichot <guilhem@mysql.com> | 2009-07-29 10:54:20 +0200 |
commit | a58b887c17c696c6e67adf0714254c57371d9cc2 (patch) | |
tree | 11695ad26b01f87834d8b8b7c8dece060209048c /mysql-test | |
parent | d871bef758aab5993daea0a7727a358a1f0b576e (diff) | |
download | mariadb-git-a58b887c17c696c6e67adf0714254c57371d9cc2.tar.gz |
Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted, does nothing":
those keywords do nothing in 5.1 (they are meant for future versions, for example featuring the Maria engine)
so they are here removed from the syntax. Adding those keywords to future versions when needed is:
- WL#5034 "Add TRANSACTIONA=0|1 and PAGE_CHECKSUM=0|1 clauses to CREATE TABLE"
- WL#5037 "New ROW_FORMAT value for CREATE TABLE: PAGE"
mysql-test/r/create.result:
test that syntax is not accepted
mysql-test/t/create.test:
test that syntax is not accepted
sql/handler.cc:
remove ROW_FORMAT=PAGE
sql/handler.h:
Mark unused objects, but I don't remove them by fear of breaking any plugin which includes this file
(see also table.h)
sql/lex.h:
removing syntax
sql/sql_show.cc:
removing output of noise keywords in SHOW CREATE TABLE and INFORMATION_SCHEMA.TABLES
sql/sql_table.cc:
removing TRANSACTIONAL
sql/sql_yacc.yy:
removing syntax
sql/table.cc:
removing TRANSACTIONAL, PAGE_CHECKSUM. Their place in the frm file is not reclaimed,
for compatibility with older 5.1.
sql/table.h:
Mark unused objects, but I don't remove them by fear of breaking any plugin which includes this file
(and there are several engines which use the content TABLE_SHARE and thus rely on a certain binary
layout of this structure).
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/create.result | 14 | ||||
-rw-r--r-- | mysql-test/t/create.test | 24 |
2 files changed, 38 insertions, 0 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index bd11a8725ef..3373d206952 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1894,4 +1894,18 @@ DROP TABLE t1; create table `me:i`(id int); drop table `me:i`; +# -- +# -- Bug#45829: CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted, does nothing +# -- + +drop table if exists t1,t2,t3; +create table t1 (a int) transactional=0; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'transactional=0' at line 1 +create table t2 (a int) page_checksum=1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'page_checksum=1' at line 1 +create table t3 (a int) row_format=page; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'page' at line 1 + +# -- End of Bug#45829 + End of 5.1 tests diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index f9708002ee6..75ad6c056c1 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -1539,5 +1539,29 @@ DROP TABLE t1; create table `me:i`(id int); drop table `me:i`; +########################################################################### + +# +# Bug#45829 CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted, does nothing +# + +--echo +--echo # -- +--echo # -- Bug#45829: CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted, does nothing +--echo # -- +--echo + +--disable_warnings +drop table if exists t1,t2,t3; +--enable_warnings +--error ER_PARSE_ERROR +create table t1 (a int) transactional=0; +--error ER_PARSE_ERROR +create table t2 (a int) page_checksum=1; +--error ER_PARSE_ERROR +create table t3 (a int) row_format=page; +--echo +--echo # -- End of Bug#45829 + --echo --echo End of 5.1 tests |