summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorVlad Lesin <vlad_lesin@mail.ru>2020-06-15 13:40:50 +0300
committerVlad Lesin <vlad_lesin@mail.ru>2020-06-24 14:37:54 +0300
commit97f7d4a9b4da77cb79699a0ea873e4a0e628e8a3 (patch)
treeec6b0d3ddc3707e32dcfff4e91f9f9d81dd35e96 /sql/sql_table.cc
parente3104c4a8c6b97bbc295a2ec7802c30c51fb7801 (diff)
downloadmariadb-git-97f7d4a9b4da77cb79699a0ea873e4a0e628e8a3.tar.gz
MDEV-22726: Add check that one can't change general or slow log to a
transactional engine
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 7cce3bcc323..b3a600eec36 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -8925,6 +8925,13 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
DBUG_RETURN(true);
}
+ if (create_info->db_type == maria_hton &&
+ create_info->transactional != HA_CHOICE_NO)
+ {
+ my_error(ER_TRANSACTIONAL_ARIA_LOG_ENGINE, MYF(0));
+ DBUG_RETURN(true);
+ }
+
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (alter_info->flags & Alter_info::ALTER_PARTITION)
{