MDEV-39412: parse error reading tabs in ranges

mariadb-plugin-columnstore.install.generated

@@ -1 +1,3 @@
 #File is generated by ColumnstoreLibrary.cmake, do not edit
+etc/mysql/columnstore.cnf # added in dbcon/mysql/CMakeLists.txt
+usr/local/mysql/lib/plugin/ha_columnstore.so # added in dbcon/mysql/CMakeLists.txt

mysql-test/EXTRA_SERVER_QUICKSTART.txt

@@ -0,0 +1,89 @@
+================================================================================
+EXTRA SERVER QUICK START GUIDE
+================================================================================
+
+This feature allows you to start additional MariaDB server instances during
+test execution while mysql-test-run is already running.
+
+BASIC USAGE
+-----------
+
+1. In your test file (.test):
+
+   # Start extra server
+   --let $extra_server_num= 1
+   --source include/start_extra_server.inc
+
+   # Connect to it
+   --connect (extra1, 127.0.0.1, root, , test, $EXTRA_SERVER_PORT)
+   CREATE TABLE t1 (id INT);
+   SELECT * FROM t1;
+
+   # Stop it
+   --disconnect extra1
+   --let $extra_server_num= 1
+   --source include/stop_extra_server.inc
+
+2. Run the test:
+
+   cd mysql-test
+   ./mysql-test-run main.extra_server_example
+
+WHAT IT DOES
+------------
+
+✓ Creates new data directory: var/extra_server_N/data (copied from install.db)
+✓ Picks non-conflicting port: MASTER_MYPORT + 10 + N
+✓ Creates unique socket: var/tmp/extra_server_N.sock
+✓ Starts mysqld with --skip-grant-tables (no password needed)
+✓ Exports connection info: $EXTRA_SERVER_PORT, $EXTRA_SERVER_SOCKET, etc.
+
+AVAILABLE VARIABLES AFTER START
+--------------------------------
+
+$EXTRA_SERVER_PORT    - Port number (e.g., 10011 for server 1)
+$EXTRA_SERVER_SOCKET  - Socket path
+$EXTRA_SERVER_DATADIR - Data directory path
+$EXTRA_SERVER_PID     - Process ID
+
+CUSTOM PORT/SOCKET
+------------------
+
+--let $extra_server_num= 2
+--let $extra_server_port= 15000
+--let $extra_server_socket= /tmp/my_custom.sock
+--source include/start_extra_server.inc
+
+MULTIPLE SERVERS
+----------------
+
+--let $extra_server_num= 1
+--source include/start_extra_server.inc
+
+--let $extra_server_num= 2
+--source include/start_extra_server.inc
+
+# Now you have two extra servers running!
+
+FILES CREATED
+-------------
+
+lib/start_extra_server.pl         - Perl script (main implementation)
+include/start_extra_server.inc    - Test include to start server
+include/stop_extra_server.inc     - Test include to stop server
+main/extra_server_example.test    - Example test
+lib/EXTRA_SERVER_README.md        - Full documentation
+
+TROUBLESHOOTING
+---------------
+
+If server fails to start, check:
+  var/log/extra_server_N.err
+
+Connection info is stored in:
+  var/tmp/extra_server_N.info
+
+Direct invocation (from Perl or shell):
+  perl lib/start_extra_server.pl <server_num> [port] [socket]
+
+================================================================================

mysql-test/include/get_rec_idx_ranges_from_opt_ctx.inc

@@ -4,9 +4,9 @@ set @opt_context=
          '(?<=set @opt_context=\')([\n\r].*)*(?=\'\;#opt_context_ends)')
          from information_schema.optimizer_context);
 set @records=
-    (select JSON_DETAILED(JSON_EXTRACT(@opt_context, '$**.num_of_records')));
+    (select JSON_DETAILED(JSON_EXTRACT(@opt_context, '$**.file_stat_records')));
 select *from json_table(@records,
-                        '$[*]' columns(num_of_records text path '$')) as jt;
+                        '$[*]' columns(file_stat_records text path '$')) as jt;
 set @file_stat_records=
     (select JSON_DETAILED(JSON_EXTRACT(@opt_context, '$**.file_stat_records')));
 select *from json_table(@file_stat_records,

mysql-test/include/opt_context_schema.inc

@@ -14,7 +14,7 @@ let $opt_context_schema=
             "type": "string",
             "minLength": 1
           },
-          "num_of_records": {
+          "file_stat_records": {
             "type": "number"
           },
           "file_stat_records": {

mysql-test/include/start_extra_server.inc

@@ -0,0 +1,105 @@
+# ==== Purpose ====
+#
+# Start an additional mysqld server instance while mysql-test-run is running.
+# This creates a new data directory (copied from var/install.db), picks a
+# non-conflicting port and socket, and starts the server.
+#
+# ==== Usage ====
+#
+# --let $extra_server_num= 1
+# [--let $extra_server_port= 13307]
+# [--let $extra_server_socket= /path/to/socket]
+# --source include/start_extra_server.inc
+#
+# After sourcing this file, the following variables will be set:
+#   $EXTRA_SERVER_PORT    - Port number of the extra server
+#   $EXTRA_SERVER_SOCKET  - Socket path of the extra server
+#   $EXTRA_SERVER_DATADIR - Data directory of the extra server
+#   $EXTRA_SERVER_PID     - Process ID of the extra server
+#
+# You can then connect to the server using:
+#   --connect (conn_name, 127.0.0.1, root, , test, $EXTRA_SERVER_PORT)
+#
+# ==== Parameters ====
+#
+# $extra_server_num
+#   Required. A unique number identifying this extra server instance.
+#   Must be unique across all extra servers started in the same test.
+#
+# $extra_server_port
+#   Optional. Custom port number for the server. If not specified,
+#   the port will be auto-calculated as MASTER_MYPORT + 10 + server_num.
+#
+# $extra_server_socket
+#   Optional. Custom socket path. If not specified, will use
+#   $MYSQLTEST_VARDIR/tmp/extra_server_N.sock
+#
+
+if (!$extra_server_num)
+{
+  --die extra_server_num must be set before sourcing start_extra_server.inc
+}
+
+--let $include_filename= start_extra_server.inc [server $extra_server_num]
+--source include/begin_include_file.inc
+
+# Export mysqltest variables to environment for Perl
+--let extra_server_num_env= $extra_server_num
+--let extra_server_port_env= $extra_server_port
+--let extra_server_socket_env= $extra_server_socket
+
+--perl
+  use strict;
+  use warnings;
+
+  my $server_num = $ENV{extra_server_num_env} or die "extra_server_num not set";
+  my $port = $ENV{extra_server_port_env} || "";
+  my $socket = $ENV{extra_server_socket_env} || "";
+
+  my $script = "$ENV{MYSQL_TEST_DIR}/lib/start_extra_server.pl";
+  die "Script not found: $script\n" unless -f $script;
+
+  my $cmd = "perl $script $server_num";
+  $cmd .= " $port" if $port;
+  $cmd .= " $socket" if $socket;
+
+  print "Executing: $cmd\n";
+  my $result = system($cmd);
+  if ($result != 0) {
+    die "Failed to start extra server $server_num (exit code: $result)\n";
+  }
+EOF
+
+# Read connection info from the info file
+--let $extra_server_info_file= $MYSQLTEST_VARDIR/tmp/extra_server_$extra_server_num.info
+
+--perl
+  use strict;
+  use warnings;
+
+  my $file = $ENV{extra_server_info_file};
+  die "Info file not found: $file\n" unless -f $file;
+
+  open my $fh, '<', $file or die "Cannot read $file: $!";
+  my %info;
+  while (<$fh>) {
+    chomp;
+    if (/^(\w+)=(.+)/) {
+      $info{$1} = $2;
+    }
+  }
+  close $fh;
+
+  # Export to environment for mysqltest
+  $ENV{EXTRA_SERVER_PORT} = $info{PORT} if $info{PORT};
+  $ENV{EXTRA_SERVER_SOCKET} = $info{SOCKET} if $info{SOCKET};
+  $ENV{EXTRA_SERVER_DATADIR} = $info{DATADIR} if $info{DATADIR};
+  $ENV{EXTRA_SERVER_PID} = $info{PID} if $info{PID};
+
+  print "Extra server $ENV{extra_server_num_env} connection info:\n";
+  print "  PORT=$info{PORT}\n" if $info{PORT};
+  print "  SOCKET=$info{SOCKET}\n" if $info{SOCKET};
+EOF
+
+--let $include_filename= start_extra_server.inc [server $extra_server_num]
+--source include/end_include_file.inc

mysql-test/include/stop_extra_server.inc

@@ -0,0 +1,98 @@
+# ==== Purpose ====
+#
+# Stop an extra server instance that was started with start_extra_server.inc
+#
+# ==== Usage ====
+#
+# --let $extra_server_num= 1
+# --source include/stop_extra_server.inc
+#
+# ==== Parameters ====
+#
+# $extra_server_num
+#   Required. The number of the extra server to stop (same number used
+#   when starting it with start_extra_server.inc).
+#
+
+if (!$extra_server_num)
+{
+  --die extra_server_num must be set before sourcing stop_extra_server.inc
+}
+
+--let $include_filename= stop_extra_server.inc [server $extra_server_num]
+--source include/begin_include_file.inc
+
+# Export mysqltest variable to environment for Perl
+--let extra_server_num_env= $extra_server_num
+
+--perl
+  use strict;
+  use warnings;
+  use POSIX ":sys_wait_h";
+
+  my $server_num = $ENV{extra_server_num_env} or die "extra_server_num not set";
+  my $vardir = $ENV{MYSQLTEST_VARDIR} or die "MYSQLTEST_VARDIR not set";
+  my $info_file = "$vardir/tmp/extra_server_$server_num.info";
+
+  unless (-f $info_file) {
+    print "Warning: Info file not found: $info_file\n";
+    print "Server may not be running or already stopped.\n";
+    exit 0;
+  }
+
+  # Read PID and other info
+  open my $fh, '<', $info_file or die "Cannot read $info_file: $!";
+  my ($pid, $pid_file, $socket);
+  while (<$fh>) {
+    chomp;
+    $pid = $1 if /^PID=(.+)/;
+    $pid_file = $1 if /^PID_FILE=(.+)/;
+    $socket = $1 if /^SOCKET=(.+)/;
+  }
+  close $fh;
+
+  unless ($pid) {
+    print "Warning: No PID found in $info_file\n";
+    unlink $info_file;
+    exit 0;
+  }
+
+  print "Stopping extra server $server_num (PID: $pid)...\n";
+
+  # Send SIGTERM to server
+  if (kill 0, $pid) {
+    kill 'TERM', $pid;
+
+    # Wait for process to exit (up to 10 seconds)
+    my $max_wait = 10;
+    my $waited = 0;
+    while ($waited < $max_wait) {
+      my $result = waitpid($pid, WNOHANG);
+      if ($result == $pid || $result == -1) {
+        print "Server process $pid has exited\n";
+        last;
+      }
+      sleep 1;
+      $waited++;
+    }
+
+    # If still running, send SIGKILL
+    if ($waited >= $max_wait && kill 0, $pid) {
+      print "Server did not stop gracefully, sending SIGKILL...\n";
+      kill 'KILL', $pid;
+      sleep 1;
+    }
+  } else {
+    print "Process $pid is not running\n";
+  }
+
+  # Cleanup files
+  unlink $info_file if -f $info_file;
+  unlink $pid_file if $pid_file && -f $pid_file;
+  unlink $socket if $socket && -S $socket;
+
+  print "Extra server $server_num stopped\n";
+EOF
+
+--let $include_filename= stop_extra_server.inc [server $extra_server_num]
+--source include/end_include_file.inc