Skip to content

Commit

Permalink
Added set statements with 'grave accents' to tests 'set_testing-t.csv…
Browse files Browse the repository at this point in the history
…' and 'test_filtered_set_statements-t' #3479
  • Loading branch information
JavierJF committed Jun 12, 2021
1 parent 1f47834 commit d58b108
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
8 changes: 8 additions & 0 deletions test/tap/tests/set_testing-t.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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'}"
6 changes: 6 additions & 0 deletions test/tap/tests/test_filtered_set_statements-t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ std::vector<std::pair<std::string, std::string>> 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<std::string> get_valid_set_query_set(const std::string& set_query, const std::string param) {
Expand Down

0 comments on commit d58b108

Please sign in to comment.