From 23e252aef2260172c30740391ce2923ae9f59f9b Mon Sep 17 00:00:00 2001 From: Rucha Deodhar Date: Wed, 5 Jul 2023 16:35:01 +0530 Subject: [PATCH] MDEV-23187 misses resetting collation connection MDEV-23187 misses resetting collation connection causing test failures for 10.5+ bugs. --- mysql-test/main/func_json.result | 2 ++ mysql-test/main/func_json.test | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result index ed719e7b453..a6a8f39bd2d 100644 --- a/mysql-test/main/func_json.result +++ b/mysql-test/main/func_json.result @@ -1293,10 +1293,12 @@ ERROR 42000: Incorrect parameter count in the call to native function 'json_leng SELECT JSON_LENGTH(); ERROR 42000: Incorrect parameter count in the call to native function 'JSON_LENGTH' # MDEV-23187: Assorted assertion failures in json_find_path with certain collations +SET @old_collation_connection= @@COLLATION_CONNECTION; SET COLLATION_CONNECTION= ucs2_unicode_ci; SELECT JSON_VALUE('["foo"]', '$**[0]') AS f; f foo +SET @@COLLATION_CONNECTION= @old_collation_connection; # # End of 10.4 tests # diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test index 9cfde5489e7..ef747efb79d 100644 --- a/mysql-test/main/func_json.test +++ b/mysql-test/main/func_json.test @@ -823,9 +823,13 @@ SELECT JSON_LENGTH(); --echo # MDEV-23187: Assorted assertion failures in json_find_path with certain collations +SET @old_collation_connection= @@COLLATION_CONNECTION; + SET COLLATION_CONNECTION= ucs2_unicode_ci; SELECT JSON_VALUE('["foo"]', '$**[0]') AS f; +SET @@COLLATION_CONNECTION= @old_collation_connection; + --echo # --echo # End of 10.4 tests --echo #