1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix myisam.test failure: let CREATE TABLE discard TRANSACTIONAL=1 attribute

Browse Source 
if the storage engine doesn't support transactions.
This commit is contained in:
Sergey Petrunya 2009-09-16 15:31:20 +04:00
parent 3d60f05f98
commit f78278efbd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_table.cc
View File

@ -3747,11 +3747,19 @@ bool mysql_create_table_no_lock(THD *thd,
/* Give warnings for not supported table options */ /* Give warnings for not supported table options */
if (create_info->transactional && !file->ht->commit) if (create_info->transactional && !file->ht->commit)
{
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
ER_ILLEGAL_HA_CREATE_OPTION, ER_ILLEGAL_HA_CREATE_OPTION,
ER(ER_ILLEGAL_HA_CREATE_OPTION), ER(ER_ILLEGAL_HA_CREATE_OPTION),
file->engine_name()->str, file->engine_name()->str,
"TRANSACTIONAL=1"); "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)); VOID(pthread_mutex_lock(&LOCK_open));
if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))