diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:26:40 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:26:40 +0300 |
commit | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (patch) | |
tree | 1adb4d44b9b7e7cf20e63e3ebc95ba05f7dc47e9 /sql/item_func.h | |
parent | 5b79303b40e31d77f616c2b797f58de41973e6a3 (diff) | |
parent | c7bb33724826dab53831b74bc0cf7ec311eb13f0 (diff) | |
download | mariadb-git-9c34a4124d67d9e3f70837eaeb11290f35e8f8d0.tar.gz |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index f47b1895c87..25f96be7962 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2217,6 +2217,8 @@ public: Item_func_uuid_short(THD *thd): Item_int_func(thd) {} const char *func_name() const { return "uuid_short"; } longlong val_int(); + bool const_item() const { return false; } + table_map used_tables() const { return RAND_TABLE_BIT; } void fix_length_and_dec() { max_length= 21; unsigned_flag=1; } bool check_vcol_func_processor(uchar *int_arg) |