Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 32 deletions

diff --git a/mysql-test/main/func_encrypt_nossl.result b/mysql-test/main/func_encrypt_nossl.result
index 7afc9fa6..274db05f 100644
--- a/mysql-test/main/func_encrypt_nossl.result
+++ b/mysql-test/main/func_encrypt_nossl.result
@@ -2,87 +2,87 @@ select des_encrypt("test", 'akeystr');
 des_encrypt("test", 'akeystr')
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_encrypt("test", 1);
 des_encrypt("test", 1)
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_encrypt("test", 9);
 des_encrypt("test", 9)
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_encrypt("test", 100);
 des_encrypt("test", 100)
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_encrypt("test", NULL);
 des_encrypt("test", NULL)
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_encrypt(NULL, NULL);
 des_encrypt(NULL, NULL)
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_decrypt("test", 'anotherkeystr');
 des_decrypt("test", 'anotherkeystr')
 NULL
 Warnings:
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_decrypt(1, 1);
 des_decrypt(1, 1)
 NULL
 Warnings:
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_decrypt(des_encrypt("test", 'thekey'));
 des_decrypt(des_encrypt("test", 'thekey'))
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select hex(des_encrypt("hello")),des_decrypt(des_encrypt("hello"));
 hex(des_encrypt("hello"))	des_decrypt(des_encrypt("hello"))
 NULL	NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_decrypt(des_encrypt("hello",4));
 des_decrypt(des_encrypt("hello",4))
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_decrypt(des_encrypt("hello",'test'),'test');
 des_decrypt(des_encrypt("hello",'test'),'test')
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select hex(des_encrypt("hello")),hex(des_encrypt("hello",5)),hex(des_encrypt("hello",'default_password'));
 hex(des_encrypt("hello"))	hex(des_encrypt("hello",5))	hex(des_encrypt("hello",'default_password'))
 NULL	NULL	NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 Warning	1289	The 'des_encrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
@@ -90,28 +90,28 @@ select des_decrypt(des_encrypt("hello"),'default_password');
 des_decrypt(des_encrypt("hello"),'default_password')
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select des_decrypt(des_encrypt("hello",4),'password4');
 des_decrypt(des_encrypt("hello",4),'password4')
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 SET @a=des_decrypt(des_encrypt("hello"));
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 flush des_key_file;
 select @a = des_decrypt(des_encrypt("hello"));
 @a = des_decrypt(des_encrypt("hello"))
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 select hex("hello");
 hex("hello")
 68656C6C6F
@@ -119,13 +119,13 @@ select hex(des_decrypt(des_encrypt("hello",4),'password2'));
 hex(des_decrypt(des_encrypt("hello",4),'password2'))
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working
 select hex(des_decrypt(des_encrypt("hello","hidden")));
 hex(des_decrypt(des_encrypt("hello","hidden")))
 NULL
 Warnings:
-Note	1287	'des_encrypt' is deprecated and will be removed in a future release
-Note	1287	'des_decrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_encrypt' is deprecated and will be removed in a future release
+Warning	1287	'des_decrypt' is deprecated and will be removed in a future release
 Warning	1289	The 'des_decrypt' feature is disabled; you need MariaDB built with 'openssl des cipher (HAVE_des)' to have it working