Merge master into branch

Author: Blargian

README.md

@@ -37,7 +37,7 @@ curl https://clickhouse.com/ | sh
 Every month we get together with the community (users, contributors, customers, those interested in learning more about ClickHouse) to discuss what is coming in the latest release.
 If you are interested in sharing what you've built on ClickHouse, let us know.
 
-* [v25.4 Community & Release Call](https://clickhouse.com/company/events/v25-4-community-release-call) - April 22
+* [v25.5 Community & Release Call](https://clickhouse.com/company/events/v25-5-community-release-call) - May 22
 
 ## Upcoming Events
 

cmake/autogenerated_versions.txt

@@ -2,11 +2,11 @@
 
 # NOTE: VERSION_REVISION has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54498)
+SET(VERSION_REVISION 54499)
 SET(VERSION_MAJOR 25)
-SET(VERSION_MINOR 5)
+SET(VERSION_MINOR 6)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 90b13185583c7d97f4a33af179684153167c4921)
-SET(VERSION_DESCRIBE v25.5.1.1-testing)
-SET(VERSION_STRING 25.5.1.1)
+SET(VERSION_GITHASH 063c439f4337aca894c2478a7cdbc1dd20cf30dd)
+SET(VERSION_DESCRIBE v25.6.1.1-testing)
+SET(VERSION_STRING 25.6.1.1)
 # end of autochange

docs/en/operations/server-configuration-parameters/_server_settings_outside_source.md

@@ -244,7 +244,6 @@ To manually turn on error history collection [`system.error_log`](../../operatio
         <reserved_size_rows>8192</reserved_size_rows>
         <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
         <flush_on_crash>false</flush_on_crash>
-        <symbolize>true</symbolize>
     </error_log>
 </clickhouse>
 ```

docs/en/operations/system-tables/error_log.md

@@ -18,16 +18,8 @@ Columns:
 - `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
 - `code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code number of the error.
 - `error` ([LowCardinality(String)](../../sql-reference/data-types/string.md)) - Name of the error.
-- `last_error_time` ([DateTime](../../sql-reference/data-types/datetime.md))  — The time when the last error happened.
-- `last_error_message` ([String](../../sql-reference/data-types/string.md)) — Message for the last error.
 - `value` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of times this error happened.
 - `remote` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Remote exception (i.e. received during one of the distributed queries).
-- `last_error_query_id` ([String](../../sql-reference/data-types/string.md)) — Id of a query that caused the last error (if available).
-- `last_error_trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A stack trace that represents a list of physical addresses where the called methods are stored.
-- `last_error_symbols` ([Array(LowCardinality(String))](../../sql-reference/data-types/array.md)), If the symbolization is enabled, contains demangled symbol names, corresponding to the `last_error_trace`.
-- `last_error_lines` ([Array(LowCardinality(String))](../../sql-reference/data-types/array.md)), If the symbolization is enabled, contains strings with file names with line numbers, corresponding to the `last_error_trace`.
-
-The symbolization can be enabled or disabled in the `symbolize` under `error_log` in the server's configuration file.
 
 **Example**
 

docs/en/operations/system-tables/errors.md

@@ -21,9 +21,6 @@ Columns:
 - `last_error_message` ([String](../../sql-reference/data-types/string.md)) — message for the last error.
 - `last_error_trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A [stack trace](https://en.wikipedia.org/wiki/Stack_trace) that represents a list of physical addresses where the called methods are stored.
 - `remote` ([UInt8](../../sql-reference/data-types/int-uint.md)) — remote exception (i.e. received during one of the distributed queries).
-- `last_error_query_id` ([String](../../sql-reference/data-types/string.md)) — Id of a query that caused the last error (if available).
-- `last_error_symbols` ([Array(LowCardinality(String))](../../sql-reference/data-types/array.md)) — Contains demangled symbol names, corresponding to the `last_error_trace`.
-- `last_error_lines` ([Array(LowCardinality(String))](../../sql-reference/data-types/array.md)) — Contains strings with file names with line numbers, corresponding to the `last_error_trace`.
 
 :::note
 Counters for some errors may increase during successful query execution. It's not recommended to use this table for server monitoring purposes unless you are sure that corresponding error can not be a false positive.

programs/local/LocalServer.cpp

@@ -948,14 +948,14 @@ void LocalServer::processConfig()
                 DatabaseCatalog::instance().startupBackgroundTasks();
             }
 
-            /// For ClickHouse local if path is not set the loader will be disabled.
-            global_context->getUserDefinedSQLObjectsStorage().loadObjects();
-
             LOG_DEBUG(log, "Loaded metadata.");
         }
 
         if (!attached_system_database)
             attachSystemTablesServer(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::SYSTEM_DATABASE), false);
+
+        if (fs::exists(fs::path(path) / "user_defined"))
+            global_context->getUserDefinedSQLObjectsStorage().loadObjects();
     }
     else if (!getClientConfiguration().has("no-system-tables"))
     {

src/Client/ClientBaseOptimizedParts.cpp

@@ -102,6 +102,10 @@ void ClientApplicationBase::parseAndCheckOptions(OptionsDescription & options_de
     /// Check positional options.
     for (const auto & op : parsed.options)
     {
+        /// Skip all options after empty `--`. These are processed separately into the Application configuration.
+        if (op.string_key.empty() && op.original_tokens[0].starts_with("--"))
+            break;
+
         if (!op.unregistered && op.string_key.empty() && !op.original_tokens[0].starts_with("--")
             && !op.original_tokens[0].empty() && !op.value.empty())
         {