From d58b108b74345c31c2c50867fe0d95d26836894b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?= Date: Sat, 12 Jun 2021 17:14:53 +0200 Subject: [PATCH] Added set statements with 'grave accents' to tests 'set_testing-t.csv' and 'test_filtered_set_statements-t' #3479 --- test/tap/tests/set_testing-t.csv | 8 ++++++++ test/tap/tests/test_filtered_set_statements-t.cpp | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/test/tap/tests/set_testing-t.csv b/test/tap/tests/set_testing-t.csv index 6a4776fcb..d7403e139 100644 --- a/test/tap/tests/set_testing-t.csv +++ b/test/tap/tests/set_testing-t.csv @@ -92,3 +92,11 @@ "SET time_zone='+04:00', sql_mode='NO_ENGINE_SUBSTITUTION', max_join_size=10000; SET CHARSET 'latin1'", "{'time_zone':'+04:00', 'sql_mode':'NO_ENGINE_SUBSTITUTION', 'max_join_size':'10000', 'character_set_results':'latin1', 'character_set_client':'latin1'}", "['character_set_connection', 'collation_connection']" "SET session_track_gtids=ALL_GTIDS", "{'session_track_gtids':'ALL_GTIDS'}" "SET sql_safe_updates=1, session_track_schema=1, sql_mode = concat(@@sql_mode,',STRICT_TRANS_TABLES')", "{'sql_safe_updates':'ON', 'sql_mode':'concat(@@sql_mode,\',STRICT_TRANS_TABLES\')'}" +"set `group_concat_max_len`=4096", "{'group_concat_max_len':'4096'}" +"SET `sql_select_limit`=3030; ", "{'sql_select_limit':'3030'}" +"SET `time_zone`='+04:00', `sql_mode`='NO_ENGINE_SUBSTITUTION', `max_join_size`=10000; SET CHARACTER SET 'latin1'", "{'time_zone':'+04:00', 'sql_mode':'NO_ENGINE_SUBSTITUTION', 'max_join_size':'10000', 'character_set_results':'latin1', 'character_set_client':'latin1'}", "['character_set_connection', 'collation_connection']" +"SET `character_set_results`='binary', `sql_mode`='NO_ENGINE_SUBSTITUTION', `character_set_client`='latin1', `max_join_size`=10000", "{'character_set_results':'binary', 'sql_mode':'NO_ENGINE_SUBSTITUTION', 'character_set_client':'latin1', 'max_join_size':'10000'}" +"set `tx_isolation`='READ-COMMITTED', `group_concat_max_len`=4096", "{'transaction_isolation':'READ-COMMITTED', 'group_concat_max_len':'4096'}" +"set `net_write_timeout`=30", "{'net_write_timeout':'30'}" +"SET `sql_auto_is_null`=ON", "{'sql_auto_is_null':'ON'}" +"set `character_set_results`=null; set names latin7; set `character_set_client`='utf8mb4';", "{'character_set_results':'latin7', 'collation_connection':'latin7_general_ci', 'character_set_connection':'latin7', 'character_set_client':'utf8mb4'}" diff --git a/test/tap/tests/test_filtered_set_statements-t.cpp b/test/tap/tests/test_filtered_set_statements-t.cpp index 8e72bc5fe..fee2dee09 100644 --- a/test/tap/tests/test_filtered_set_statements-t.cpp +++ b/test/tap/tests/test_filtered_set_statements-t.cpp @@ -48,6 +48,12 @@ std::vector> filtered_set_queries { { "net_read_timeout", "28801" }, // NOTE: This variable has been temporarily ignored. Check issues #3442 and #3441. { "session_track_schema", "1" }, + // Added several variables to be set using `grave accents`. See issue #3479. + { "`wait_timeout`", "28801" }, + { "`character_set_results`", "latin1" }, + { "`character_set_results`", "latin1" }, + { "`autocommit`", "1" }, + { "`max_join_size`", "18446744073709551615" }, }; std::vector get_valid_set_query_set(const std::string& set_query, const std::string param) {