diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-14 15:28:59 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-14 15:28:59 +0300 |
| commit | 8c0e5ebfd372a53cd6b2104c366ac4b6ac4a304b (patch) | |
| tree | eb012e1ffa7c670e4b583ea47303c6438fadffd9 /mysql-test/r | |
| parent | a6b3433b1f8b8008692106c01fa705ab4848a296 (diff) | |
| download | mariadb-git-8c0e5ebfd372a53cd6b2104c366ac4b6ac4a304b.tar.gz | |
after merge fix
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_encrypt.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/subselect.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_encrypt.result b/mysql-test/r/func_encrypt.result index abdfda0423f..d32e67fe7d5 100644 --- a/mysql-test/r/func_encrypt.result +++ b/mysql-test/r/func_encrypt.result @@ -138,4 +138,4 @@ explain extended select des_decrypt(des_encrypt("hello",4),'password2'), des_dec id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select high_priority des_decrypt(des_encrypt(_latin1'hello',4),_latin1'password2') AS `des_decrypt(des_encrypt("hello",4),'password2')`,des_decrypt(des_encrypt(_latin1'hello',_latin1'hidden')) AS `des_decrypt(des_encrypt("hello","hidden"))` +Note 1003 select des_decrypt(des_encrypt(_latin1'hello',4),_latin1'password2') AS `des_decrypt(des_encrypt("hello",4),'password2')`,des_decrypt(des_encrypt(_latin1'hello',_latin1'hidden')) AS `des_decrypt(des_encrypt("hello","hidden"))` diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 22438967b57..9fc47d67abb 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -1549,7 +1549,7 @@ id select_type table type possible_keys key key_len ref rows Extra 3 UNION t1 system NULL NULL NULL NULL 1 -2 UNION RESULT <union2> ALL NULL NULL NULL NULL NULL Warnings: -Note 1003 select high_priority test.t1.s1 AS `s1` from test.t1 +Note 1003 select test.t1.s1 AS `s1` from test.t1 drop table t1; CREATE TABLE t1 (number char(11) NOT NULL default '') ENGINE=MyISAM CHARSET=latin1; INSERT INTO t1 VALUES ('69294728265'),('18621828126'),('89356874041'),('95895001874'); |