MariaDB · AestheticAkhmad · Nov 14, 2025 · Nov 18, 2025 · Nov 19, 2025 · Nov 24, 2025
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.github/workflows/label_recent_prs.yaml b/.github/workflows/label_recent_prs.yaml
@@ -0,0 +1,78 @@
+name: Label recent pull requests
+
+on:
+  schedule:
+    - cron: "0 2 * * *" # 02:00 UTC daily
+  workflow_dispatch:    # allow manual runs
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
+jobs:
+  label-prs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Auto-label PRs
+        env:
+          REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          REPO=MariaDB/server
+          set -euo pipefail
+
+          # List first 200 PRs lacking classification labels as JSON
+          gh pr list \
+            --repo "$REPO" \
+            --search 'is:pr AND -label:"External Contribution" AND -label:"MariaDB Foundation" AND -label:"MariaDB Corporation" AND -label:"Codership" AND created:>2025-11' \
+            --limit 200 \
+            -s all \
+            --json number,author \
+            --jq '.[]' |
+          while read -r pr; do
+            pr_number=$(echo "$pr" | jq -r '.number')
+            author=$(echo "$pr" | jq -r '.author.login')
+
+            echo "Evaluating PR #$pr_number by $author"
+
+            # Check if author is in the developers team
+            if gh api \
+              -H "Accept: application/vnd.github+json" \
+              "/orgs/MariaDB/teams/developers/members/$author" \
+              >/dev/null 2>&1; then
+              echo "Author is in developers team"
+              is_developer=1
+            else
+              is_developer=0
+              echo "Author is not in developers team"
+            fi
+            # Check if author is in the staff team
+            if gh api \
+              -H "Accept: application/vnd.github+json" \
+              "/orgs/MariaDB/teams/staff/members/$author" \
+              >/dev/null 2>&1; then
+              echo "Author is in staff team"
+              is_foundation=1
+            else
+              is_foundation=0
+              echo "Author is not in staff team"
+            fi
+
+            if [[ "$is_foundation" -ne 0 ]]; then
+              label="MariaDB Foundation"
+            else
+              if [[ "$is_developer" -ne 0 ]]; then
+                label="MariaDB Corporation"
+              else
+                label="External Contribution"
+              fi
+            fi
+
+            echo "Applying label [$label] to PR#[$pr_number] by [$author]"
+
+            gh issue edit "$pr_number" \
+              --repo "$REPO" \
+              --add-label "$label"
+          done
diff --git a/.github/workflows/windows-arm64.yml b/.github/workflows/windows-arm64.yml
@@ -48,4 +48,10 @@ jobs:
           $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
-          perl bld\mysql-test\mysql-test-run.pl --force --parallel=$parallel --suite=main  --mysqld=--loose-innodb-flush-log-at-trx-commit=2
+          # 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
diff --git a/.gitignore b/.gitignore
@@ -26,10 +26,12 @@ install_manifest*.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 CTestTestfile.cmake
+mariadb-plugin-columnstore.install.generated
 Docs/INFO_BIN
 Docs/INFO_SRC
 Makefile
 TAGS
+mariadb-plugin-columnstore.install.generated
 Testing/
 tmp/
 VERSION.dep

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -530,14 +530,12 @@ fedora upgrade-from:
     matrix:
       # Get latest versions of all major versions
       - UPGRADE_PATH:
-        - "10.6>11.4"
-        - "10.3"
-        - "10.4"
-        - "10.4.8" # Test unexpected table rebuilds as in https://jira.mariadb.org/browse/MDEV-28727
+        - "10.6>11.8"
         - "10.5"
         - "10.6"
         - "10.11"
         - "11.4"
+        - "11.8"
   script:
     - |
       if [[ $UPGRADE_PATH == *">"* ]]; then

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
@@ -132,7 +132,7 @@ get_make_parallel_flag
 SSL_LIBRARY=--with-ssl=system
 
 if [ "x$warning_mode" = "xpedantic" ]; then
-  warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
+  warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -Wno-format-truncation -D_POSIX_SOURCE"
   c_warnings="$warnings"
   cxx_warnings="$warnings -std=c++98"
 # NOTE: warning mode should not influence optimize/debug mode.

diff --git a/BUILD/compile-pentium64-asan-max b/BUILD/compile-pentium64-asan-max
@@ -23,7 +23,7 @@ path=`dirname $0`
 #
 
 extra_flags="$pentium64_cflags $debug_cflags -lasan -O -g -fsanitize=address -USAFEMALLOC -UFORCE_INIT_OF_VARS -Wno-uninitialized -Wno-maybe-uninitialized -DMYSQL_SERVER_SUFFIX=-asan-max"
-extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs $disable_asan_plugins"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs $disable_asan_plugins --with-asan=ON"
 export LDFLAGS="-ldl"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium64-ubsan b/BUILD/compile-pentium64-ubsan
@@ -31,7 +31,7 @@ path=`dirname $0`
 #   the destination
 #
 
-extra_flags="$pentium64_cflags $debug_cflags -fsanitize=undefined -DWITH_UBSAN -Wno-conversion -Wno-uninitialized"
+extra_flags="$pentium64_cflags $debug_cflags -fsanitize=undefined -DWITH_UBSAN -Wno-conversion -Wno-uninitialized -Wno-unused-parameter"
 extra_configs="$pentium_configs $debug_configs -DWITH_UBSAN=ON -DMYSQL_MAINTAINER_MODE=NO --without-spider"
 
 . "$path/FINISH.sh"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -246,6 +246,10 @@ ENDIF()
 OPTION(WITH_MSAN "Enable memory sanitizer" OFF)
 IF (WITH_MSAN)
   MY_CHECK_AND_SET_COMPILER_FLAG("-fsanitize=memory -fsanitize-memory-track-origins -U_FORTIFY_SOURCE")
+  IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "20.0")
+    # workaround for https://github.com/llvm/llvm-project/issues/179605
+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O1")
+  ENDIF()
   IF(NOT (have_C__fsanitize_memory__fsanitize_memory_track_origins__U_FORTIFY_SOURCE
           AND have_CXX__fsanitize_memory__fsanitize_memory_track_origins__U_FORTIFY_SOURCE))
     MESSAGE(FATAL_ERROR "Compiler doesn't support -fsanitize=memory flags")
@@ -296,9 +300,13 @@ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -D_GLIBCXX_ASSERTIONS")
 ENDIF()
 
-OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
+OPTION(ENABLE_GCOV "Enable gcov (debug, macOS and Linux builds only)" OFF)
 IF (ENABLE_GCOV)
-  MY_CHECK_AND_SET_COMPILER_FLAG("-DHAVE_gcov -fprofile-arcs -ftest-coverage -lgcov" DEBUG)
+  IF (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    MY_CHECK_AND_SET_COMPILER_FLAG("--coverage" DEBUG)
+  ELSE()
+    MY_CHECK_AND_SET_COMPILER_FLAG("-DHAVE_gcov -fprofile-arcs -ftest-coverage -lgcov" DEBUG)
+  ENDIF()
 ENDIF()
 
 OPTION(WITHOUT_PACKED_SORT_KEYS "disable packed sort keys"  OFF)
@@ -553,32 +561,8 @@ IF(SOURCE_REVISION OR
                ${PROJECT_BINARY_DIR}/include/source_revision.h )
 ENDIF()
 
-CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
-    ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
-
-# Handle the "INFO_*" files.
-INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
-# Source: This can be done during the cmake phase, all information is
-# available, but should be repeated on each "make" just in case someone
-# does "cmake ; make ; git pull ; make".
-CREATE_INFO_SRC(${CMAKE_BINARY_DIR}/Docs)
-ADD_CUSTOM_TARGET(INFO_SRC ALL
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_src.cmake
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-)
-# Build flags: This must be postponed to the make phase.
-ADD_CUSTOM_TARGET(INFO_BIN ALL
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_bin.cmake
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-)
-
 INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
 
-# MDEV-6526 these files are not installed anymore
-#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
-#                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
-
 IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
   IF(WITH_WSREP)

diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md
@@ -187,7 +187,7 @@ C file names use the `.c` extension, C++ files use the `.cc` extension and heade
 
 ### Language standards
 
-For pure-C files we use C99 (starting with 10.4.25) and for C++ we use C++11 (starting with 11.8.1).
+For pure-C files we use C99 (starting with 10.4.25) and for C++ we use C++17 (starting with 11.8.1).
 The code need to be able to compile on multiple platforms using different compilers (for example: Windows / Linux, x86_64 / ARM).
 
 ### Line lengths

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,15 +5,15 @@ MariaDB Server has a vibrant community contributing in a wide range of areas. Th
 ### Engage online with other community members
 ---
 -   [MariaDB on Zulip](https://mariadb.zulipchat.com/)
--   [maria-developers mailing list](http://launchpad.net/~maria-developers)
--   [maria-discuss mailing list](http://launchpad.net/~maria-discuss)
--   [maria-docs mailing list](http://launchpad.net/~maria-docs)
--   The MariaDB Foundation and MariaDB Corporation have a presence on Reddit, Twitter and Facebook. See the  [social media page](https://mariadb.com/kb/en/mariadb/social-media/).
+-   [maria-developers mailing list](https://lists.mariadb.org/postorius/lists/developers.lists.mariadb.org/)
+-   [maria-discuss mailing list](https://lists.mariadb.org/postorius/lists/discuss.lists.mariadb.org/)
+-   [maria-docs mailing list](https://lists.mariadb.org/postorius/lists/docs.lists.mariadb.org/)
+-   The MariaDB Foundation and MariaDB Corporation have a presence on Reddit, Twitter and Facebook. See the  [social media page](https://mariadb.com/docs/general-resources/community/joining-the-community).
 
 ### Help document MariaDB
 ----
--   Contribute towards [documenting MariaDB Server](https://mariadb.com/kb/en/meta/writing-editing-library-articles/)  and its ecosystem by adding new content or improving existing content.
--   [Translate](https://mariadb.com/kb/en/meta/translating-library-articles/)  existing documentation.
+-   Contribute towards [documenting MariaDB Server](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation)  and its ecosystem by adding new content or improving existing content.
+-   [Translate](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation)  existing documentation.
 
 ### Help debug and develop MariaDB
 -----
@@ -44,4 +44,4 @@ New contributors can ask questions any time, but we will provide immediate feedb
 ### Additional resources
 ----
  - [MariaDB Foundation ](https://mariadb.org/)
- - [Knowledge Base](https://mariadb.com/kb/en/)
+ - [MariaDB Documentation](https://mariadb.com/docs/)
diff --git a/CREDITS b/CREDITS
@@ -66,7 +66,7 @@ following services to the MariaDB community:
 - Bug fixing in MariaDB (for bugs that affects a large part of the community)
 - Building the official MariaDB binaries
 - Maintaining https://mariadb.org
-- Documenting MariaDB in the MariaDB Knowledge Base https://mariadb.com/kb
+- Documenting MariaDB in the MariaDB Documentation https://mariadb.com/kb
 
 To be able to do the above we need help from corporations and individuals!
 

diff --git a/Docs/mysql.info b/Docs/mysql.info