MDEV-38881: fix for 11.8

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://mariadb.org/donate/

.github/pull_request_template.md

@@ -1,57 +1,51 @@
 <!--
 Thank you for contributing to the MariaDB Server repository!
 
-You can help us review your changes faster by filling this template <3
+You can help us review your changes faster by filling in this template <3
 
-If you have any questions related to MariaDB or you just want to
-hang out and meet other community members, please join us on
-https://mariadb.zulipchat.com/ .
+If you have any questions related to MariaDB or you just want to hang out and meet other community members, please join us on https://mariadb.zulipchat.com/ .
 -->
 
 <!--
-If you've already identified a https://jira.mariadb.org/ issue
-that seems to track this bug/feature, please add its number below.
+If you've already identified a https://jira.mariadb.org/ issue that seems to track this bug/feature, please add its number below.
 -->
-- [x] *The Jira issue number for this PR is: MDEV-_____*
+- [x] *The Jira issue number for this PR is: MDEV-______*
 
 <!--
 An amazing description should answer some questions like:
 1. What problem is the patch trying to solve?
-2. If some output changed, what was it looking like before
-   the change and how it's looking with this patch applied
-3. Do you think this patch might introduce side-effects in
-   other parts of the server?
+2. If some output changed that is not visible in a test case, what was it looking like before the change and how it's looking with this patch applied?
+3. Do you think this patch might introduce side-effects in other parts of the server?
 -->
 ## Description
 TODO: fill description here
 
+## Release Notes
+TODO: What should the release notes say about this change?
+Include any changed system variables, status variables or behaviour. Optionally list any https://mariadb.com/kb/ pages that need changing.
+
 ## How can this PR be tested?
 
-TODO: modify the automated test suite to verify that the PR causes MariaDB to
-behave as intended. Consult the documentation on
-["Writing good test cases"](https://mariadb.org/get-involved/getting-started-for-developers/writing-good-test-cases-mariadb-server).
-In many cases, this will be as simple as modifying one `.test` and one `.result`
-file in the `mysql-test/` subdirectory. Without _automated_ tests, future regressions
-in the expected behavior can't be automatically detected and verified.
+TODO: modify the automated test suite to verify that the PR causes MariaDB to behave as intended.
+Consult the documentation on ["Writing good test cases"](https://mariadb.org/get-involved/getting-started-for-developers/writing-good-test-cases-mariadb-server).
+<!--
+In many cases, this will be as simple as modifying one `.test` and one `.result` file in the `mysql-test/` subdirectory.
+Without automated tests, future regressions in the expected behavior can't be automatically detected and verified.
+-->
 
-If the changes are not amenable to automated testing, please explain why not and
-carefully describe how to test manually.
+If the changes are not amenable to automated testing, please explain why not and carefully describe how to test manually.
 
 <!--
-Tick one of the following boxes [x] to help us understand
-if the base branch for the PR is correct
+Tick one of the following boxes [x] to help us understand if the base branch for the PR is correct.
 -->
 ## Basing the PR against the correct MariaDB version
-- [ ] *This is a new feature and the PR is based against the latest MariaDB development branch*
-- [ ] *This is a bug fix and the PR is based against the earliest branch in which the bug can be reproduced*
+- [ ] *This is a new feature or a refactoring, and the PR is based against the `main` branch.*
+- [ ] *This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.*
 
 <!--
-You might consider answering some questions like:
-1. Does this affect the on-disk format used by MariaDB?
-2. Does this change any behavior experienced by a user
-   who upgrades from a version prior to this patch?
-3. Would a user be able to start MariaDB on a datadir
-   created prior to your fix?
+  All code merged into the MariaDB codebase must meet a quality standard and codying style.
+  Maintainers are happy to point out inconsistencies but in order to speed up the review and merge process we ask you to check the CODING standards.
 -->
-## Backward compatibility
-TODO: fill details here, if applicable, or remove the section
+## PR quality check
+- [ ] I checked the [CODING_STANDARDS.md](https://github.com/MariaDB/server/blob/-/CODING_STANDARDS.md) file and my PR conforms to this where appropriate.
+- [ ] For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

.github/workflows/windows-arm64.yml

@@ -0,0 +1,57 @@
+name: Build on Windows ARM64
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'bb-*'
+      - '[0-9]+.[0-9]+'
+      - '*wlad*'
+  pull_request:
+
+jobs:
+  build:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+
+    runs-on: windows-11-arm
+
+    steps:
+      - name: Configure git
+        run: |
+          # We won't be able to successfully run mtr
+          # unless we configure autocrlf.
+          git config --global core.autocrlf input
+
+      - uses: actions/checkout@v4
+
+      - name: Install prerequisites
+        run: |
+          # Install bison to compile
+          choco install winflexbison3
+
+      - name: Build
+        run: |
+          # speedup checkout by excluding uninteresting modules
+          git config submodule.storage/columnstore/columnstore.update none
+          git config submodule.storage/maria/libmarias3.update none
+          git config submodule.storage/rocksdb/rocksdb.update none
+          git config submodule.wsrep-lib.update none
+          mkdir bld
+          cd bld
+          cmake .. -DWITH_SSL=bundled
+          cmake --build . --config RelWithDebinfo --verbose -- -m
+
+      - name: Test MTR
+        run: |
+          $env:PATH = "C:\Strawberry\perl\bin;$env:PATH;C:\Program Files (x86)\Windows Kits\10\Debuggers\arm64"
+          #Calculate parallel as 4 * number of processors
+          $parallel = 4 * [int]$env:NUMBER_OF_PROCESSORS
+          # create case-sensitive directory to run tests in
+          $tmp = (Get-Item $env:TEMP).FullName
+          $tmp = $tmp -replace '\\','/'
+          $cidir = "$tmp/ci"
+          mkdir $cidir
+          fsutil file setCaseSensitiveInfo $cidir enable
+          perl bld\mysql-test\mysql-test-run.pl --force --parallel=$parallel --suite=main,innodb --vardir=$cidir/var --mysqld=--lower-case-table-names=0  --mysqld=--loose-innodb-flush-log-at-trx-commit=2 --mysqld=--debug-no-sync

.gitignore

@@ -30,9 +30,11 @@ Docs/INFO_BIN
 Docs/INFO_SRC
 Makefile
 TAGS
+mariadb-plugin-columnstore.install.generated
 Testing/
 tmp/
 VERSION.dep
+cmake/submodule_info.cmake
 configure
 client/async_example
 client/mysql
@@ -113,6 +115,7 @@ plugin/auth_pam/config_auth_pam.h
 plugin/aws_key_management/aws-sdk-cpp
 plugin/aws_key_management/aws_sdk_cpp
 plugin/aws_key_management/aws_sdk_cpp-prefix
+sbom.json
 scripts/comp_sql
 scripts/make_binary_distribution
 scripts/msql2mysql
@@ -121,8 +124,10 @@ scripts/mysql_config.pl
 scripts/mysql_convert_table_format
 scripts/mysql_find_rows
 scripts/mysql_fix_extensions
-scripts/mysql_fix_privilege_tables.sql
-scripts/mysql_fix_privilege_tables_sql.c
+scripts/mariadb_sys_schema.sql
+scripts/mariadb_fix_privilege_tables.sql
+scripts/mariadb_fix_privilege_tables_sql.c
+scripts/mariadb_sys_schema.sql
 scripts/mysql_install_db
 scripts/mysql_secure_installation
 scripts/mysql_setpermission
@@ -242,6 +247,7 @@ storage/perfschema/pfs_config.h
 storage/rocksdb/ldb
 storage/rocksdb/myrocks_hotbackup
 storage/rocksdb/mysql_ldb
+storage/rocksdb/mysql_ldb.1
 storage/rocksdb/rdb_source_revision.h
 storage/rocksdb/sst_dump
 strings/conf_to_src
@@ -570,39 +576,38 @@ extra/mariadb-waitpid
 libmysqld/examples/mariadb-client-test-embedded
 libmysqld/examples/mariadb-embedded
 libmysqld/examples/mariadb-test-embedded
-man/mariadb.1
-man/mariadb-access.1
-man/mariadb-admin.1
-man/mariadb-backup.1
-man/mariadb-binlog.1
-man/mariadb-check.1
-man/mariadb-client-test.1
-man/mariadb-client-test-embedded.1
-man/mariadb_config.1
-man/mariadb-convert-table-format.1
-man/mariadbd.8
-man/mariadbd-multi.1
-man/mariadbd-safe.1
-man/mariadbd-safe-helper.1
-man/mariadb-dump.1
-man/mariadb-dumpslow.1
-man/mariadb-embedded.1
-man/mariadb-find-rows.1
-man/mariadb-fix-extensions.1
-man/mariadb-hotcopy.1
-man/mariadb-import.1
-man/mariadb-install-db.1
-man/mariadb-ldb.1
-man/mariadb-plugin.1
-man/mariadb-secure-installation.1
-man/mariadb-setpermission.1
-man/mariadb-show.1
-man/mariadb-slap.1
-man/mariadb-test.1
-man/mariadb-test-embedded.1
-man/mariadb-tzinfo-to-sql.1
-man/mariadb-upgrade.1
-man/mariadb-waitpid.1
+man/mariabackup.1
+man/mysql.1
+man/mysql_client_test.1
+man/mysql_client_test_embedded.1
+man/mysql_config.1
+man/mysql_convert_table_format.1
+man/mysql_embedded.1
+man/mysql_find_rows.1
+man/mysql_fix_extensions.1
+man/mysql_install_db.1
+man/mysql_plugin.1
+man/mysql_secure_installation.1
+man/mysql_setpermission.1
+man/mysql_tzinfo_to_sql.1
+man/mysql_upgrade.1
+man/mysql_waitpid.1
+man/mysqlaccess.1
+man/mysqladmin.1
+man/mysqlbinlog.1
+man/mysqlcheck.1
+man/mysqld.8
+man/mysqld_multi.1
+man/mysqld_safe.1
+man/mysqld_safe_helper.1
+man/mysqldump.1
+man/mysqldumpslow.1
+man/mysqlhotcopy.1
+man/mysqlimport.1
+man/mysqlshow.1
+man/mysqlslap.1
+man/mysqltest.1
+man/mysqltest_embedded.1
 scripts/mariadb-access
 scripts/mariadb-convert-table-format
 scripts/mariadbd-multi