diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
| commit | 4cd7979c56130194cc3742e1037998d11f98c047 (patch) | |
| tree | 70131981da1d874d68b9e8cc8e7bf293e405907e /sql/item_func.h | |
| parent | 619dc2b24f26aea29345dc3f3289bed406738025 (diff) | |
| parent | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (diff) | |
| download | mariadb-git-4cd7979c56130194cc3742e1037998d11f98c047.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 0fb365f8107..689bfb84034 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2460,6 +2460,7 @@ 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; } void fix_length_and_dec() { max_length= 21; unsigned_flag=1; } table_map used_tables() const { return RAND_TABLE_BIT; } |