From dc732c56280d4eb69bcd3fe21128576d20eb9636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 19 Jun 2023 13:34:04 +0000 Subject: [PATCH] Add support for sql_quote_show_create #4254 --- include/proxysql_structs.h | 4 +++- lib/MySQL_Session.cpp | 1 + test/tap/tests/generate_set_session_csv.cpp | 3 +++ test/tap/tests/set_testing-240-t.cpp | 2 +- test/tap/tests/set_testing-240.h | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/proxysql_structs.h b/include/proxysql_structs.h index 522232b35..1ff20e646 100644 --- a/include/proxysql_structs.h +++ b/include/proxysql_structs.h @@ -215,6 +215,7 @@ enum mysql_variable_name { SQL_GENERATE_INVISIBLE_PRIMARY_KEY, SQL_SQL_LOG_BIN, SQL_SQL_MODE, + SQL_QUOTE_SHOW_CREATE, SQL_REQUIRE_PRIMARY_KEY, SQL_SQL_SAFE_UPDATES, SQL_SQL_SELECT_LIMIT, @@ -1177,7 +1178,8 @@ mysql_variable_st mysql_tracked_variables[] { { SQL_GENERATE_INVISIBLE_PRIMARY_KEY, SETTING_VARIABLE, false, false, false, true, (char *)"sql_generate_invisible_primary_key", NULL, (char *)"" , false} , { SQL_SQL_LOG_BIN, SETTING_VARIABLE, false, false, false, true, (char *)"sql_log_bin", NULL, (char *)"ON" , false} , { SQL_SQL_MODE, SETTING_VARIABLE, true, false, false, false, (char *)"sql_mode" , NULL, (char *)"" , false} , - { SQL_REQUIRE_PRIMARY_KEY, SETTING_VARIABLE, false, false, false, true, (char *)"sql_require_primary_key", NULL, (char *)"" , false} , + { SQL_QUOTE_SHOW_CREATE, SETTING_VARIABLE, false, false, false, true, (char *)"sql_quote_show_create", NULL, (char *)"" , false} , + { SQL_REQUIRE_PRIMARY_KEY, SETTING_VARIABLE, false, false, false, true, (char *)"sql_require_primary_key", NULL, (char *)"" , false} , { SQL_SQL_SAFE_UPDATES, SETTING_VARIABLE, true, false, false, true, (char *)"sql_safe_updates", NULL, (char *)"OFF" , false} , { SQL_SQL_SELECT_LIMIT, SETTING_VARIABLE, false, false, true, false, (char *)"sql_select_limit", NULL, (char *)"DEFAULT" , false} , { SQL_TIME_ZONE, SETTING_VARIABLE, true, false, false, false, (char *)"time_zone", NULL, (char *)"SYSTEM" , false} , diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index 895953d8b..5ee61017a 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -81,6 +81,7 @@ static const std::set mysql_variables_boolean = { "sql_big_selects", "sql_generate_invisible_primary_key", "sql_log_bin", + "sql_quote_show_create", "sql_require_primary_key", "sql_safe_updates", "unique_checks", diff --git a/test/tap/tests/generate_set_session_csv.cpp b/test/tap/tests/generate_set_session_csv.cpp index 63a6abbbc..2ad71a54a 100644 --- a/test/tap/tests/generate_set_session_csv.cpp +++ b/test/tap/tests/generate_set_session_csv.cpp @@ -287,6 +287,9 @@ int main() { vars["wsrep_osu_method"] = new variable("wsrep_osu_method", true, false, false); add_values_and_quotes("wsrep_osu_method", {"TOI","RSU"}); + vars["sql_quote_show_create"] = new variable("sql_quote_show_create", true, false, true); + vars["sql_quote_show_create"]->add(bool_values); + vars["sql_require_primary_key"] = new variable("sql_require_primary_key", true, false, true); vars["sql_require_primary_key"]->add(bool_values); diff --git a/test/tap/tests/set_testing-240-t.cpp b/test/tap/tests/set_testing-240-t.cpp index db6e9b829..bd309b467 100644 --- a/test/tap/tests/set_testing-240-t.cpp +++ b/test/tap/tests/set_testing-240-t.cpp @@ -47,7 +47,7 @@ char *schema=(char *)"information_schema"; int silent = 0; int sysbench = 0; int local=0; -int queries=3000; +int queries=5000; int uniquequeries=0; int histograms=-1; diff --git a/test/tap/tests/set_testing-240.h b/test/tap/tests/set_testing-240.h index 66698f9c9..60254da37 100644 --- a/test/tap/tests/set_testing-240.h +++ b/test/tap/tests/set_testing-240.h @@ -35,6 +35,7 @@ const std::vector possible_unknown_variables = { "max_statement_time", "sql_generate_invisible_primary_key", "log_slow_filter", + "sql_quote_show_create", "sql_require_primary_key" };