From f47375d16c1c89c2ffea087617f1b4dd23734f00 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Fri, 19 May 2023 10:28:13 +0200
Subject: [PATCH] Support Tableau

---
 programs/server/config.xml                                | 8 ++++++--
 src/IO/Resource/DynamicResourceManager.cpp                | 4 ++--
 .../queries/0_stateless/02737_sql_auto_is_null.reference  | 1 +
 tests/queries/0_stateless/02737_sql_auto_is_null.sql      | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 tests/queries/0_stateless/02737_sql_auto_is_null.reference
 create mode 100644 tests/queries/0_stateless/02737_sql_auto_is_null.sql

diff --git a/programs/server/config.xml b/programs/server/config.xml
index 82dd697084c..c6ae47b3050 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -719,8 +719,12 @@
     <!-- Default profile of settings. -->
     <default_profile>default</default_profile>
 
-    <!-- Comma-separated list of prefixes for user-defined settings. -->
-    <custom_settings_prefixes></custom_settings_prefixes>
+    <!-- Comma-separated list of prefixes for user-defined settings.
+         The server will allow to set these settings, and retrieve them with the getSetting function.
+         They are also logged in the query_log, similarly to other settings, but have no special effect.
+         The "SQL_" prefix is introduced for compatibility with MySQL - these settings are being set be Tableau.
+    -->
+    <custom_settings_prefixes>SQL_</custom_settings_prefixes>
 
     <!-- System profile of settings. This settings are used by internal processes (Distributed DDL worker and so on). -->
     <!-- <system_profile>default</system_profile> -->
diff --git a/src/IO/Resource/DynamicResourceManager.cpp b/src/IO/Resource/DynamicResourceManager.cpp
index 49e12984e33..df0de6575f4 100644
--- a/src/IO/Resource/DynamicResourceManager.cpp
+++ b/src/IO/Resource/DynamicResourceManager.cpp
@@ -98,9 +98,9 @@ DynamicResourceManager::State::Resource::~Resource()
     if (attached_to != nullptr)
     {
         ISchedulerNode * root = nodes.find("/")->second.ptr.get();
-        attached_to->event_queue->enqueue([scheduler = attached_to, root]
+        attached_to->event_queue->enqueue([my_scheduler = attached_to, root]
         {
-            scheduler->removeChild(root);
+            my_scheduler->removeChild(root);
         });
     }
 }
diff --git a/tests/queries/0_stateless/02737_sql_auto_is_null.reference b/tests/queries/0_stateless/02737_sql_auto_is_null.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02737_sql_auto_is_null.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02737_sql_auto_is_null.sql b/tests/queries/0_stateless/02737_sql_auto_is_null.sql
new file mode 100644
index 00000000000..22f1a9524ca
--- /dev/null
+++ b/tests/queries/0_stateless/02737_sql_auto_is_null.sql
@@ -0,0 +1,2 @@
+SET SQL_AUTO_IS_NULL = 0;
+SELECT getSetting('SQL_AUTO_IS_NULL');