summaryrefslogtreecommitdiff
path: root/sql/sql_alter.h
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2018-05-08 14:14:36 +0300
committerSergei Golubchik <serg@mariadb.org>2018-06-30 16:12:45 +0200
commit7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869 (patch)
treecf553afeb451ad6a49fee4cb262ea8362c9f0e85 /sql/sql_alter.h
parentb5184c7efbe817be07de886b0e8bf61432f22f69 (diff)
downloadmariadb-git-7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869.tar.gz
MDEV-16102 Wrong ER_DUP_ENTRY upon ADD UNIQUE KEY on versioned table
* ignore CHECK constraint for historical rows; * FOREIGN KEY test case. TODO: MDEV-16301 IB: use real table name for error messages on ALTER Closes tempesta-tech/mariadb#491 Closes #748
Diffstat (limited to 'sql/sql_alter.h')
-rw-r--r--sql/sql_alter.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/sql_alter.h b/sql/sql_alter.h
index 268dbc43abd..108b98afdd7 100644
--- a/sql/sql_alter.h
+++ b/sql/sql_alter.h
@@ -32,14 +32,7 @@ public:
enum enum_enable_or_disable { LEAVE_AS_IS, ENABLE, DISABLE };
- bool data_modifying() const
- {
- return flags & (
- ALTER_PARSER_ADD_COLUMN |
- ALTER_PARSER_DROP_COLUMN |
- ALTER_CHANGE_COLUMN |
- ALTER_COLUMN_ORDER);
- }
+ bool vers_prohibited(THD *thd) const;
/**
The different values of the ALGORITHM clause.