From 111d169e40775bbaa0c85c8a4e25d4cb04d211b5 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov <79837786+mariadb-LeonidFedorov@users.noreply.github.com> Date: Tue, 30 Sep 2025 18:54:17 +0400 Subject: [PATCH] fix(crash): Debug build of columnstore crashed on asserts with 11.8 (#3800) due this wonderful code DBUG_ASSERT(!comment || !comment[0] || comment[strlen(comment)-1] != '.'); DBUG_ASSERT(!comment || !comment[0] || comment[strlen(comment)-1] != ' '); So I had to fix the comments --- dbcon/mysql/ha_mcs_sysvars.cpp | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dbcon/mysql/ha_mcs_sysvars.cpp b/dbcon/mysql/ha_mcs_sysvars.cpp index 980f38a45..09d5bb57a 100644 --- a/dbcon/mysql/ha_mcs_sysvars.cpp +++ b/dbcon/mysql/ha_mcs_sysvars.cpp @@ -49,16 +49,16 @@ static MYSQL_THDVAR_ENUM(compression_type, PLUGIN_VAR_RQCMDARG, // fe_conn_info pointer static MYSQL_THDVAR_ULONGLONG(fe_conn_info_ptr, PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT, - "FrontEnd connection structure pointer. For internal usage.", NULL, NULL, 0, 0, + "FrontEnd connection structure pointer. For internal usage", NULL, NULL, 0, 0, ~0U, 1); // optimizer flags vault static MYSQL_THDVAR_ULONGLONG(original_optimizer_flags, PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT, - "Vault for original optimizer flags. For internal usage.", NULL, NULL, 0, 0, + "Vault for original optimizer flags. For internal usage", NULL, NULL, 0, 0, ~0U, 1); static MYSQL_THDVAR_ULONGLONG(original_option_bits, PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT, - "Storage for thd->variables.option_bits. For internal usage.", NULL, NULL, 0, 0, + "Storage for thd->variables.option_bits. For internal usage", NULL, NULL, 0, 0, ~0U, 1); const char* mcs_select_handler_mode_values[] = {"OFF", "ON", "AUTO", NullS}; @@ -93,11 +93,11 @@ static MYSQL_THDVAR_UINT(query_accel_parallel_factor, PLUGIN_VAR_RQCMDARG, // legacy system variables static MYSQL_THDVAR_ULONG(decimal_scale, PLUGIN_VAR_RQCMDARG, - "The default decimal precision for calculated column sub-operations ", NULL, NULL, + "The default decimal precision for calculated column sub-operations", NULL, NULL, 8, 0, 18, 1); static MYSQL_THDVAR_BOOL(varbin_always_hex, PLUGIN_VAR_NOCMDARG, - "Always display/process varbinary columns as if they have been hexified.", NULL, + "Always display/process varbinary columns as if they have been hexified", NULL, NULL, 0); static MYSQL_THDVAR_BOOL(use_decimal_scale, PLUGIN_VAR_NOCMDARG, @@ -105,14 +105,14 @@ static MYSQL_THDVAR_BOOL(use_decimal_scale, PLUGIN_VAR_NOCMDARG, static MYSQL_THDVAR_BOOL( double_for_decimal_math, PLUGIN_VAR_NOCMDARG, - "Enable/disable for ColumnStore to replace DECIMAL with DOUBLE in arithmetic operation.", NULL, NULL, 0); + "Enable/disable for ColumnStore to replace DECIMAL with DOUBLE in arithmetic operation", NULL, NULL, 0); static MYSQL_THDVAR_BOOL(decimal_overflow_check, PLUGIN_VAR_NOCMDARG, - "Enable/disable for ColumnStore to check for overflow in arithmetic operation.", + "Enable/disable for ColumnStore to check for overflow in arithmetic operation", NULL, NULL, 0); static MYSQL_THDVAR_BOOL(ordered_only, PLUGIN_VAR_NOCMDARG, - "Always use the first table in the from clause as the large side " + "Always use the first table in the from clause as the large side" "table for joins", NULL, NULL, 0); @@ -125,27 +125,27 @@ static MYSQL_THDVAR_ULONG(stringtable_threshold, PLUGIN_VAR_RQCMDARG, 20, 9, ~0U, 1); static MYSQL_THDVAR_ULONG(diskjoin_smallsidelimit, PLUGIN_VAR_RQCMDARG, - "The maximum amount of disk space in MB to use per query for storing " + "The maximum amount of disk space in MB to use per query for storing" "'small side' tables for a disk-based join. (0 = unlimited)", NULL, NULL, 0, 0, ~0U, 1); static MYSQL_THDVAR_ULONG(diskjoin_largesidelimit, PLUGIN_VAR_RQCMDARG, - "The maximum amount of disk space in MB to use per join for storing " + "The maximum amount of disk space in MB to use per join for storing" "'large side' table data for a disk-based join. (0 = unlimited)", NULL, NULL, 0, 0, ~0U, 1); static MYSQL_THDVAR_ULONG(diskjoin_bucketsize, PLUGIN_VAR_RQCMDARG, - "The maximum size in MB of each 'small side' table in memory.", NULL, NULL, 100, 1, + "The maximum size in MB of each 'small side' table in memory", NULL, NULL, 100, 1, ~0U, 1); static MYSQL_THDVAR_ULONG(diskjoin_max_partition_tree_depth, PLUGIN_VAR_RQCMDARG, - "The maximum size of partition tree depth.", NULL, NULL, 8, 1, ~0U, 1); + "The maximum size of partition tree depth", NULL, NULL, 8, 1, ~0U, 1); -static MYSQL_THDVAR_BOOL(diskjoin_force_run, PLUGIN_VAR_RQCMDARG, "Force run for the disk join step.", NULL, +static MYSQL_THDVAR_BOOL(diskjoin_force_run, PLUGIN_VAR_RQCMDARG, "Force run for the disk join step", NULL, NULL, 0); static MYSQL_THDVAR_ULONG(max_pm_join_result_count, PLUGIN_VAR_RQCMDARG, - "The maximum size of the join result for the single block on BPP.", NULL, NULL, + "The maximum size of the join result for the single block on BPP", NULL, NULL, 1048576, 1, ~0U, 1); static MYSQL_THDVAR_ULONG(um_mem_limit, PLUGIN_VAR_RQCMDARG, @@ -153,7 +153,7 @@ static MYSQL_THDVAR_ULONG(um_mem_limit, PLUGIN_VAR_RQCMDARG, NULL, 0, 0, ~0U, 1); static MYSQL_THDVAR_ULONG(local_query, PLUGIN_VAR_RQCMDARG, - "Enable/disable the ColumnStore local PM query only feature.", NULL, NULL, 0, 0, 2, + "Enable/disable the ColumnStore local PM query only feature", NULL, NULL, 0, 0, 2, 1); static MYSQL_THDVAR_ULONG(import_for_batchinsert_delimiter, PLUGIN_VAR_RQCMDARG, @@ -216,20 +216,20 @@ static MYSQL_THDVAR_STR(pron, PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC, "Debug static MYSQL_THDVAR_ULONGLONG(cmapi_port, PLUGIN_VAR_NOCMDOPT, "CMAPI port", NULL, NULL, 8640, 100, 65356, 1); -static MYSQL_THDVAR_STR(s3_key, PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC, "S3 Authentication Key ", NULL, +static MYSQL_THDVAR_STR(s3_key, PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC, "S3 Authentication Key", NULL, NULL, ""); static MYSQL_THDVAR_STR(s3_secret, PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC, "S3 Authentication Secret", NULL, NULL, ""); static MYSQL_THDVAR_STR(s3_region, PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC, "S3 region", NULL, NULL, ""); static MYSQL_THDVAR_ULONG(max_allowed_in_values, PLUGIN_VAR_RQCMDARG, - "The maximum length of the entries in the IN query clause.", NULL, NULL, 6000, 1, + "The maximum length of the entries in the IN query clause", NULL, NULL, 6000, 1, ~0U, 1); static my_bool innodb_queries_use_mcs; static MYSQL_SYSVAR_BOOL(innodb_queries_use_mcs, innodb_queries_use_mcs, - PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, - "Direct all InnoDB-only queries into MCS via Select Handler.", NULL, NULL, FALSE); + PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, + "Direct all InnoDB-only queries into MCS via Select Handler", NULL, NULL, FALSE); static MYSQL_THDVAR_BOOL(unstable_optimizer, PLUGIN_VAR_RQCMDARG, "Apply optimizer rules after translation from SELECT_LEX/UNION", NULL, NULL, FALSE);