From 0b59e4411eecb5c532a272e258aba99be0b3028b Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 28 Mar 2013 22:27:47 +0400 Subject: [PATCH] Fixing test failure in the previous commit (utf16le merge from MySQL-5.6). Recording new correct results in mysql-test/r/func_encrypt_ucs2.result --- mysql-test/r/func_encrypt_ucs2.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/r/func_encrypt_ucs2.result b/mysql-test/r/func_encrypt_ucs2.result index 2ca40434cae..5ab3b08fb5d 100644 --- a/mysql-test/r/func_encrypt_ucs2.result +++ b/mysql-test/r/func_encrypt_ucs2.result @@ -8,7 +8,7 @@ SELECT CONVERT(DES_ENCRYPT(0, CHAR('1' USING ucs2)),UNSIGNED); CONVERT(DES_ENCRYPT(0, CHAR('1' USING ucs2)),UNSIGNED) 0 Warnings: -Warning 1292 Truncated incorrect INTEGER value: '' +Warning 1292 Truncated incorrect INTEGER value: '\xFFT\xDCiK\x92j\xE6\xFC' SELECT CHAR_LENGTH(DES_DECRYPT(0xFF0DC9FC9537CA75F4, CHAR('1' USING ucs2))); CHAR_LENGTH(DES_DECRYPT(0xFF0DC9FC9537CA75F4, CHAR('1' USING ucs2))) 4