diff --git a/mysql-test/main/func_crypt.result b/mysql-test/main/func_crypt.result index 2c42d3dc845..897a326183d 100644 --- a/mysql-test/main/func_crypt.result +++ b/mysql-test/main/func_crypt.result @@ -92,6 +92,14 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: Note 1003 select password('idkfa ') AS `password('idkfa ')`,old_password('idkfa') AS `old_password('idkfa')` +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; select encrypt('1234','_.'); encrypt('1234','_.') # @@ -105,6 +113,13 @@ SELECT OLD_PASSWORD(c1), PASSWORD(c1) FROM t1; OLD_PASSWORD(c1) PASSWORD(c1) 77023ffe214c04ff *82E58A2C08AAFE72C8EB523069CD8ADB33F78F58 DROP TABLE t1; +drop table if exists t1; +create table t1 (f1 smallint(6) default null, f2 mediumtext character set utf8) +engine=myisam default charset=latin1; +insert into t1 values (null,'contraction\'s'); +insert into t1 values (-15818,'requirement\'s'); +select encrypt(f1,f2) as a from t1,(select encrypt(f1,f2) as b from t1) a; +drop table t1; # End of 5.0 tests # # Start of 10.0 tests diff --git a/mysql-test/main/func_crypt.test b/mysql-test/main/func_crypt.test index 118a7023669..7da3f0c0f98 100644 --- a/mysql-test/main/func_crypt.test +++ b/mysql-test/main/func_crypt.test @@ -1,4 +1,6 @@ -- source include/have_crypt.inc +# MDEV-27964 The function ENCRYPT() causes SIGSEGV in WITH_MSAN builds +-- source include/not_msan.inc --disable_warnings drop table if exists t1; @@ -51,6 +53,18 @@ select old_password(' i d k f a '); explain extended select password('idkfa '), old_password('idkfa'); +# +# 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; + # # Bug #13619: Crash on FreeBSD with salt like '_.' # @@ -69,6 +83,21 @@ INSERT INTO t1 VALUES (REPEAT('a', 1024)); SELECT OLD_PASSWORD(c1), PASSWORD(c1) FROM t1; DROP TABLE t1; +# +# Bug#44365 valgrind warnings with encrypt() function +# +--disable_warnings +drop table if exists t1; +--enable_warnings +create table t1 (f1 smallint(6) default null, f2 mediumtext character set utf8) +engine=myisam default charset=latin1; +insert into t1 values (null,'contraction\'s'); +insert into t1 values (-15818,'requirement\'s'); +--disable_result_log +select encrypt(f1,f2) as a from t1,(select encrypt(f1,f2) as b from t1) a; +--enable_result_log +drop table t1; + --echo # End of 5.0 tests --echo # --echo # Start of 10.0 tests diff --git a/mysql-test/main/func_encrypt.result b/mysql-test/main/func_encrypt.result index 68c44231e43..326702f3c98 100644 --- a/mysql-test/main/func_encrypt.result +++ b/mysql-test/main/func_encrypt.result @@ -183,13 +183,6 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: Note 1003 select des_decrypt(des_encrypt('hello',4),'password2') AS `des_decrypt(des_encrypt("hello",4),'password2')`,des_decrypt(des_encrypt('hello','hidden')) AS `des_decrypt(des_encrypt("hello","hidden"))` -drop table if exists t1; -create table t1 (f1 smallint(6) default null, f2 mediumtext character set utf8) -engine=myisam default charset=latin1; -insert into t1 values (null,'contraction\'s'); -insert into t1 values (-15818,'requirement\'s'); -select encrypt(f1,f2) as a from t1,(select encrypt(f1,f2) as b from t1) a; -drop table t1; # # Start of 10.1 tests # diff --git a/mysql-test/main/func_encrypt.test b/mysql-test/main/func_encrypt.test index e27a2bd46d3..4a8c20e3dbc 100644 --- a/mysql-test/main/func_encrypt.test +++ b/mysql-test/main/func_encrypt.test @@ -89,21 +89,6 @@ explain extended select des_decrypt(des_encrypt("hello",4),'password2'), des_dec # End of 4.1 tests -# -# Bug#44365 valgrind warnings with encrypt() function -# ---disable_warnings -drop table if exists t1; ---enable_warnings -create table t1 (f1 smallint(6) default null, f2 mediumtext character set utf8) -engine=myisam default charset=latin1; -insert into t1 values (null,'contraction\'s'); -insert into t1 values (-15818,'requirement\'s'); ---disable_result_log -select encrypt(f1,f2) as a from t1,(select encrypt(f1,f2) as b from t1) a; ---enable_result_log -drop table t1; - --echo # --echo # Start of 10.1 tests --echo # diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index 7a2a23e3364..3ff25dfc127 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -1942,14 +1942,6 @@ f1 2005-02-02 drop view v1; drop table t1; -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; create table t1 (f59 int, f60 int, f61 int); insert into t1 values (19,41,32); create view v1 as select f59, f60 from t1 where f59 in diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index bd968841813..3184d3a3fdc 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -1715,18 +1715,6 @@ select * from v1 where '2005.02.02'=f1; drop view v1; drop table t1; -# -# 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; - # # hide underlying tables names in case of imposibility to update (Bug#10773) #