summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-29 21:27:34 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 11:43:02 +0200
commitf93a2a3b3b5c781c164805f352e9dea948500628 (patch)
treee5a6cda5f361102c4f086594100c4d4301d4999b /sql/table.h
parent047d762d515524a6cd572b53179ff50aeb25b0d0 (diff)
downloadmariadb-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/table.h')
-rw-r--r--sql/table.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h
index b217494685b..651fab7c4cb 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -567,7 +567,6 @@ struct TABLE_SHARE
TYPELIB *intervals; /* pointer to interval info */
mysql_mutex_t LOCK_ha_data; /* To protect access to ha_data */
mysql_mutex_t LOCK_share; /* To protect TABLE_SHARE */
- MY_BITMAP *check_set; /* Fields used by check constrant */
TDC_element *tdc;
@@ -589,6 +588,7 @@ struct TABLE_SHARE
LEX_STRING comment; /* Comment about table */
CHARSET_INFO *table_charset; /* Default charset of string fields */
+ MY_BITMAP *check_set; /* Fields used by check constrant */
MY_BITMAP all_set;
/*
Key which is used for looking-up table in table cache and in the list
@@ -1087,6 +1087,7 @@ public:
MY_BITMAP *read_set, *write_set, *rpl_write_set;
/* Set if using virtual fields */
MY_BITMAP *vcol_set, *def_vcol_set;
+ /* On INSERT: fields that the user specified a value for */
MY_BITMAP *has_value_set;
/*