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 /sql/sql_table.cc | |
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 'sql/sql_table.cc')
-rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ad9671c444b..0066c66eb59 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5928,8 +5928,6 @@ mysql_prepare_alter_table(THD *thd, TABLE *table, } if (!(used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE)) create_info->key_block_size= table->s->key_block_size; - if (!(used_fields & HA_CREATE_USED_TRANSACTIONAL)) - create_info->transactional= table->s->transactional; if (!create_info->tablespace && create_info->storage_media != HA_SM_MEMORY) { |