diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
| commit | 4c89cff5582e786d1cde40b75c2290c136e64e31 (patch) | |
| tree | 098edebe3e6e97ca234bf8842580851f807cd57a /sql/item_strfunc.h | |
| parent | 4ede2fec4cb7165a469776bfdbf247db86acb297 (diff) | |
| parent | 400a8eb60f832030a04a248e2c96552aa3f44055 (diff) | |
| download | mariadb-git-4c89cff5582e786d1cde40b75c2290c136e64e31.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index e19efd31229..e68c54ab6ea 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -202,6 +202,7 @@ class Item_aes_crypt :public Item_str_binary_checksum_func protected: int what; + String tmp_value; public: Item_aes_crypt(THD *thd, Item *a, Item *b) :Item_str_binary_checksum_func(thd, a, b) {} @@ -211,8 +212,8 @@ public: class Item_func_aes_encrypt :public Item_aes_crypt { public: - Item_func_aes_encrypt(THD *thd, Item *a, Item *b): - Item_aes_crypt(thd, a, b) {} + Item_func_aes_encrypt(THD *thd, Item *a, Item *b) + :Item_aes_crypt(thd, a, b) {} void fix_length_and_dec(); const char *func_name() const { return "aes_encrypt"; } }; @@ -1241,6 +1242,7 @@ public: DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); fix_char_length(MY_UUID_STRING_LENGTH); } + table_map used_tables() const { return RAND_TABLE_BIT; } const char *func_name() const{ return "uuid"; } String *val_str(String *); bool check_vcol_func_processor(uchar *int_arg) |