diff options
| -rw-r--r-- | mysql-test/r/view.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 12 | ||||
| -rw-r--r-- | sql/item_strfunc.h | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 68cc0c4cb57..d4d6eb08cad 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1831,3 +1831,11 @@ select * from v1; t 01:00 drop view v1; +CREATE VIEW v1 AS SELECT ENCRYPT("dhgdhgd"); +SELECT * FROM v1; +drop view v1; +CREATE VIEW v1 AS SELECT SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1); +SELECT * FROM v1; +SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1) +dkjhgd +drop view v1; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 13a5f8cef1f..f131f9d2604 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -1673,3 +1673,15 @@ create view v1(k, K) as select 1,2; create view v1 as SELECT TIME_FORMAT(SEC_TO_TIME(3600),'%H:%i') as t; select * from v1; drop view v1; + +# +# using encrypt & substring_index in view (BUG#7024) +# +CREATE VIEW v1 AS SELECT ENCRYPT("dhgdhgd"); +disable_result_log; +SELECT * FROM v1; +enable_result_log; +drop view v1; +CREATE VIEW v1 AS SELECT SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1); +SELECT * FROM v1; +drop view v1; diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 8d2eb269915..c4beb3b08cb 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -322,7 +322,7 @@ public: Item_func_encrypt(Item *a, Item *b): Item_str_func(a,b) {} String *val_str(String *); void fix_length_and_dec() { maybe_null=1; max_length = 13; } - const char *func_name() const { return "ecrypt"; } + const char *func_name() const { return "encrypt"; } }; #include "sql_crypt.h" |