summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-07-23 16:26:24 +0200
committerSergei Golubchik <serg@mariadb.org>2016-08-27 16:59:12 +0200
commit3aff76f3750cf1ce2a58f093cb46190c2417f3bd (patch)
treecb6864d02c59b4b9b4d6bba553ad38a88232af5d
parent159dc969ddd2ced669acbb669bae5fc8a4383b92 (diff)
downloadmariadb-git-3aff76f3750cf1ce2a58f093cb46190c2417f3bd.tar.gz
vcol flag rename VCOL_UNKNOWN -> VCOL_FIELD_REF
-rw-r--r--sql/field.h2
-rw-r--r--sql/item.h4
-rw-r--r--sql/item_func.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/sql/field.h b/sql/field.h
index dc15cf9d10a..f3328d560b8 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -575,7 +575,7 @@ inline bool is_temporal_type_with_time(enum_field_types type)
}
/* Bits for type of vcol expression */
-#define VCOL_UNKNOWN 1 /* UDF used; Need fix_fields() to know */
+#define VCOL_FIELD_REF 1
#define VCOL_NON_DETERMINISTIC 2
#define VCOL_SESSION_FUNC 4 /* uses session data, e.g. USER or DAYNAME */
#define VCOL_TIME_FUNC 8
diff --git a/sql/item.h b/sql/item.h
index 6988543e19d..8fcbf82853d 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -2516,8 +2516,8 @@ public:
bool update_table_bitmaps_processor(void *arg);
bool switch_to_nullable_fields_processor(void *arg);
bool check_vcol_func_processor(void *arg)
- { // may be, a special flag VCOL_FIELD ?
- return mark_unsupported_function(field_name, arg, VCOL_UNKNOWN);
+ {
+ return mark_unsupported_function(field_name, arg, VCOL_FIELD_REF);
}
void cleanup();
Item_equal *get_item_equal() { return item_equal; }
diff --git a/sql/item_func.h b/sql/item_func.h
index 892dacea6ee..92bc798e044 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1470,7 +1470,7 @@ public:
virtual void print(String *str, enum_query_type query_type);
bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), "()", arg, VCOL_UNKNOWN);
+ return mark_unsupported_function(func_name(), "()", arg, VCOL_NON_DETERMINISTIC);
}
};