At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/
------------------------------------------------------------
revno: 2740
revision-id: psergey@askmonty.org-20090916113120-l7x9yfa81b6q3dmb
parent: psergey@askmonty.org-20090915212058-1h5zxw94b6czbpxb
committer: Sergey Petrunya
branch nick: mysql-5.1-maria-contd4
timestamp: Wed 2009-09-16 15:31:20 +0400
message:
Fix myisam.test failure: let CREATE TABLE discard TRANSACTIONAL=1 attribute
if the storage engine doesn't support transactions.
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc 2009-09-09 21:06:57 +0000
+++ b/sql/sql_table.cc 2009-09-16 11:31:20 +0000
@@ -3747,11 +3747,19 @@
/* Give warnings for not supported table options */
if (create_info->transactional && !file->ht->commit)
+ {
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
ER_ILLEGAL_HA_CREATE_OPTION,
ER(ER_ILLEGAL_HA_CREATE_OPTION),
file->engine_name()->str,
"TRANSACTIONAL=1");
+ /*
+ MariaDB: need to do the same for row_format and page_checksum
+ options. See MBUG#425916
+ */
+ create_info->transactional= HA_CHOICE_UNDEF;
+ create_info->used_fields &= ~HA_CREATE_USED_TRANSACTIONAL;
+ }
VOID(pthread_mutex_lock(&LOCK_open));
if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
