Merge branch 'bb-13.1-release'

Author: sanja-byelkin

.github/copilot-instructions.md

@@ -88,6 +88,9 @@ enforces the coding style — flag style violations as well as bugs.
 
 ## PR hygiene
 - Subject line starts with `MDEV-NNNNN`; body wrapped at 72 cols.
+- AI attribution must use the `Assisted-by: NAME:MODEL` line in the commit
+  comment, for example, `Assisted-by: Claude:claude-5.5-opus`. Flag if it's
+  `Co-Authored-By`, flag if an AI-assisted commit has no attribution.
 - Bug fix targets the oldest maintained branch that reproduces (≤3y since GA);
   new feature targets the main branch.
 - Bug fix commit is minimal; cleanups (unrelated and related - prerequisite

BUILD-CMAKE

@@ -105,8 +105,8 @@ CONFIGURATION PARAMETERS
 ---------------------------------------------------------------
 The procedure above will build with default configuration.
 
-Let's you want to change the  configuration parameters and have archive
-storage engine compiled into the server instead of building it as pluggable 
+Lets you want to change the  configuration parameters and have archive
+storage engine compiled into the server instead of building it as pluggable
 module.
 
 1)You can provide parameters on the command line, like
@@ -115,10 +115,10 @@ shell> cmake .  -DWITH_ARCHIVE_STORAGE_ENGINE=1
 
 This can be done during the initial configuration or any time later.
 
-Note, that parameters are "sticky", that is they are remebered in the CMake 
+Note, that parameters are "sticky", that is they are remembered in the CMake
 cache (CMakeCache.txt file in the build directory)
 
-2) Configuration using cmake-gui (Windows, OSX, or Linux with cmake-gui 
+2) Configuration using cmake-gui (Windows, OSX, or Linux with cmake-gui
 installed)
 
 From the build directory, issue

BUILD/SETUP.sh

@@ -280,7 +280,7 @@ fi
 # (returns 0 if finds lines)
 
 # As cmake doesn't like CC and CXX with a space, use symlinks from
-# /usr/lib64/ccache if they exits.
+# /usr/lib64/ccache if they exist.
 
 if ccache -V > /dev/null 2>&1 && test "$CCACHE_DISABLE" != "1" && test "$CC" = "gcc"
 then

BUILD/compile-pentium32-gcov

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
-# Need to disable ccache, or we loose the gcov-needed compiler output files.
+# Need to disable ccache, or we lose the gcov-needed compiler output files.
 
 USING_GCOV=1
 CCACHE_GCOV_VERSION_ENABLED=0

CMakeLists.txt

@@ -63,7 +63,7 @@ IF(UNIX AND NOT APPLE)
   # the empty CMAKE_BUILD_TYPE) and the build many times for
   # different build types without re-running cmake!
   # But we only care about WITH_PIC on Unix, where the check for
-  # CMAKE_BUILD_TYPE hapen to work.
+  # CMAKE_BUILD_TYPE happen to work.
   IF (CMAKE_BUILD_TYPE MATCHES "Debug")
     SET(WITH_PIC_DEFAULT ON)
   ELSE()

COMMUNITY_CONTRIBUTIONS.md

@@ -1,4 +1,4 @@
-# Community Contributions Process #
+# Community Contributions Process
 
 MariaDB Server is an Open Source project that thrives thanks to its community.
 MariaDB Foundation handles all community contributions in a timely manner.
@@ -33,7 +33,7 @@ But it's important to always have both prior to review.
 There are constant efforts (including background processes) to make sure
  the states of the Jira and the corresponding pull request(s) are kept in sync.
 
-### What should go into the jira ###
+### What should go into the jira
 
 The [Jira](https://jira.mariadb.org) is used to describe the design of the
 feature: why is it a good idea, what should work, what might not work etc.
@@ -53,9 +53,9 @@ See [here](https://mariadb.org/contribute/#contribute-to-testing)
 
 > [!CAUTION]
 > If the jira already exists and is assigned to somebody please reach out
-> to them **before** starting to working on it to avoid effort duplication. 
+> to them **before** starting to working on it to avoid effort duplication.
 
-### What should go into the pull request ###
+### What should go into the pull request
 
 The pull request is used to describe the implementation.
 E.g. how the bug is fixed. Or how the feature is implemented in detail.
@@ -72,7 +72,7 @@ And that commit should have a commit message that's compliant with
 > If there's no Jira or no reference to it in your pull request
 > there might be delays in processing it
 
-## States of a Community Contribution ##
+## States of a Community Contribution
 
 ```mermaid
 stateDiagram-v2
@@ -95,7 +95,7 @@ stateDiagram-v2
     Closed --> [*]
 ```
 
-### Draft ###
+### Draft
 
 * Pull request
   * State: Draft
@@ -122,7 +122,7 @@ the GitHub pull request viewer UI.
 > and "External Contribution" pull request labels and there's
 > been no activity for 3 months.
 
-### Open ##
+### Open
 
 * Pull request
   * State: Open
@@ -177,7 +177,7 @@ Questions and Answers
 > label to pull requests in this state, if absent.
 > This marks the contribution entering the preliminary review queue.
 
-### Preliminary Review ###
+### Preliminary Review
 
 * Pull request
   * State: Open
@@ -207,7 +207,7 @@ The preliminary reviewer does the following:
     Or that an internal developer has taken over the contribution to
     re-do it and push it directly.
 
-### Final review ###
+### Final review
 
 * Pull request
   * State: Open
@@ -253,7 +253,7 @@ detailed information:
 > There's a requirement that certain contributions need to undergo
 > a separate test step. This is usually done for the new features or
 > for more complex and risky bug fixes. If that's the desired state,
-> a test engineer will be assigned as a final reviewer. See 
+> a test engineer will be assigned as a final reviewer. See
 > https://mariadb.com/docs/server/reference/product-development/mariadb-quality-development-rules
 > for more details.
 
@@ -264,7 +264,7 @@ detailed information:
 > in the middle of the new feature development cycle or vice versa
 > it might take up to a couple of months for a developer to do a review.
 
-### Approved ###
+### Approved
 
 * Pull request
   * State: Open
@@ -288,7 +288,7 @@ The person that does the merge might need some assistance by the contributor.
 When the pull request is successfully merged the Jira should be moved to
 "Closed" state and its target version should be specified.
 
-### Merged ###
+### Merged
 
 * Pull request
   * State: Merged
@@ -303,7 +303,7 @@ This is the "success" final state for a contribution.
 Ideally all contributions will end up in this state.
 No further actions are necessary.
 
-### Closed ###
+### Closed
 
 * Pull request
   * State: Closed

Docs/replication/binlog.md

@@ -43,6 +43,8 @@ The contents of binlog files can be inspected in two ways:
 
 Unlike in the traditional binlog format, one binlog event can be stored in multiple different binlog files, and different parts of individual events can be interleaved with one another in each file. The `mariadb-binlog` program will coalesce the different parts of each event as necessary, so the output of the program is a consistent, non-interleaved stream of events. To obtain a correct seequnce of events across multiple binlog files, all binlog files should be passed to the `mariadb-binlog` program at once in correct order; this ensures that events that cross file boundaries are included in the output exactly once.
 
+Note that with `--binlog-storage-engine=innodb`, binlog files are written to disk in the background. There will be some delay from the time a transaction is committed until the data gets written to the binlog file, more so for the last page of data which is only written when it gets full or when InnoDB performs a checkpoint. The server makes the data available quickly to slaves and to `mariadb-binlog --read-from-remote-server` by reading from in-memory buffers, and the data is always written immediately to the InnoDB redo log and will be recovered correctly in case of a crash; the delayed writing to the binlog files themselves is purely a performance optimization. The `FLUSH BINARY LOGS` command can be used to force the writing of all current binlog data into the binlog files.
+
 When using the `--start-position` and `--stop-position` options of `mariadb-binlog`, it is recommended to use GTID positions. The event file offsets used in the tranditional binlog format are not used in the new binlog, and will mostly be reported as zero.
 
 The `--binlog-checksum` option is no longer used with the new binlog implementation. The binlog files are always checksummed, with a CRC32 at the end of each page. To have checksum of the data sent on the network between the master and the slave (in addition to the normal TCP checksums), use the `MASTER_SSL` option for `CHANGE MASTER` to make the connection use SSL.

client/client_priv.h

@@ -77,21 +77,11 @@ enum options_client
   OPT_MAX_CLIENT_OPTION /* should be always the last */
 };
 
-/**
-  First mysql version supporting the information schema.
-*/
-#define FIRST_INFORMATION_SCHEMA_VERSION 50003
-
 /**
   Name of the information schema database.
 */
 #define INFORMATION_SCHEMA_DB_NAME "information_schema"
 
-/**
-  First mysql version supporting the performance schema.
-*/
-#define FIRST_PERFORMANCE_SCHEMA_VERSION 50503
-
 /**
   Name of the performance schema database.
 */

client/mysql.cc

@@ -1673,10 +1673,6 @@ bool kill_query(const char *reason)
   /* First time try to kill the query, second time the connection */
   interrupted_query++;
 
-  /* mysqld < 5 does not understand KILL QUERY, skip to KILL CONNECTION */
-  if ((interrupted_query == 1) && (mysql_get_server_version(&mysql) < 50000))
-    interrupted_query= 2;
-
   /* kill_buffer is always big enough because max length of %lu is 15 */
   snprintf(kill_buffer, sizeof(kill_buffer), "KILL %s%lu",
           (interrupted_query == 1) ? "QUERY " : "",
@@ -3563,7 +3559,7 @@ static int com_help(String *buffer, char *line)
       tee_fprintf(stdout, "%s(\\%c) %s\n", buff,
 		  commands[i].cmd_char, commands[i].doc);
   }
-  if (connected && mysql_get_server_version(&mysql) >= 40100)
+  if (connected)
     put_info("\nFor server side help, type 'help contents'\n", INFO_INFO);
   return 0;
 }
@@ -4560,6 +4556,8 @@ print_tab_data(MYSQL_RES *result)
   }
   while ((cur = fetch_row(result)))
   {
+    if (interrupted_query)
+      break;
     lengths=mysql_fetch_lengths(result);
     field= mysql_fetch_fields(result);
     if (opt_binhex && is_binary_field(&field[0]))

client/mysqladmin.cc

@@ -880,7 +880,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       MYSQL_ROW row;
 
       new_line=1;
-      if (mysql_query(mysql,"show /*!40003 GLOBAL */ variables") ||
+      if (mysql_query(mysql,"show global variables") ||
 	  !(res=mysql_store_result(mysql)))
       {
 	my_printf_error(0, "unable to show variables; error: '%s'", error_flags,
@@ -902,7 +902,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       void (*func) (MYSQL_RES*, MYSQL_ROW, uint);
 
       new_line = 1;
-      if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") ||
+      if (mysql_query(mysql, "show global status") ||
 	  !(res = mysql_store_result(mysql)))
       {
 	my_printf_error(0, "unable to show status; error: '%s'", error_flags,