diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-29 21:27:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 11:43:02 +0200 |
| commit | f93a2a3b3b5c781c164805f352e9dea948500628 (patch) | |
| tree | e5a6cda5f361102c4f086594100c4d4301d4999b /sql/sql_alter.h | |
| parent | 047d762d515524a6cd572b53179ff50aeb25b0d0 (diff) | |
| download | mariadb-git-f93a2a3b3b5c781c164805f352e9dea948500628.tar.gz | |
various cleanups
* remove a confusing method name - Field::set_default_expression()
* remove handler::register_columns_for_write()
* rename stuff
* add asserts
* remove unlikely unlikely
* remove redundant if() conditions
* fix mark_unsupported_function() to report the most important violation
* don't scan vfield list for default values (vfields don't have defaults)
* move handling for DROP CONSTRAINT IF EXIST where it belongs
* don't protect engines from Alter_inplace_info::ALTER_ADD_CONSTRAINT
* comments
Diffstat (limited to 'sql/sql_alter.h')
| -rw-r--r-- | sql/sql_alter.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_alter.h b/sql/sql_alter.h index b9dc01b1e42..9e5fbaa425f 100644 --- a/sql/sql_alter.h +++ b/sql/sql_alter.h @@ -124,8 +124,8 @@ public: // Set for ADD [COLUMN] FIRST | AFTER static const uint ALTER_COLUMN_ORDER = 1L << 26; - static const uint ALTER_ADD_CONSTRAINT = 1L << 27; - static const uint ALTER_DROP_CONSTRAINT = 1L << 28; + static const uint ALTER_ADD_CHECK_CONSTRAINT = 1L << 27; + static const uint ALTER_DROP_CHECK_CONSTRAINT = 1L << 28; enum enum_enable_or_disable { LEAVE_AS_IS, ENABLE, DISABLE }; @@ -174,7 +174,7 @@ public: List<Key> key_list; // List of columns, used by both CREATE and ALTER TABLE. List<Create_field> create_list; - List<Virtual_column_info> constraint_list; + List<Virtual_column_info> check_constraint_list; // Type of ALTER TABLE operation. uint flags; // Enable or disable keys. @@ -203,7 +203,7 @@ public: alter_list.empty(); key_list.empty(); create_list.empty(); - constraint_list.empty(); + check_constraint_list.empty(); flags= 0; keys_onoff= LEAVE_AS_IS; num_parts= 0; |