Merge branch 'stable-23.10' into MCOL-4628-SET-DOUBLE_COL-TO-DECIMAL_COL-RETURNS-ERROR

Author: mariadb-LeonidFedorov

.drone.jsonnet

@@ -21,7 +21,7 @@ git clone https://github.com/MariaDB/server.git
 MariaDB server contains many git submodules that need to be checked out with:
 
 ```bash
-git submodule update --init --recursive --depth=1
+git submodule update --init --recursive
 
 ```
 
@@ -46,12 +46,27 @@ git config --global --add safe.directory `pwd`
 
 ## Build
 
-Regarding dependencies: If this is the first time building MCS on your system you should either use the `./install-deps.sh` script or pass `--install-deps` to the `bootstrap_mcs.sh` script.
+The `bootstrap_mcs.sh` script can now do **two** main things:
 
-For development convenience, building the MariaDB server with MCS can be done with:
+1. **Build & install** ColumnStore into your system
+```bash
+cd server/storage/columnstore/columnstore
 
+sudo build/bootstrap_mcs.sh  --install-deps
 ```
-sudo -E build/bootstrap_mcs.sh
+
+2. **Build native OS packages** (RPM or DEB)
+
+```bash
+cd server/storage/columnstore/columnstore
+sudo build/bootstrap_mcs.sh  --install-deps --build-packages
+# → find your .rpm/.deb files in the build directory
 ```
+Note: Packages can be built only for the OS you’re on—for so for example if you are running --build-packages on Rocky Linux it will produce RPMs for Rocky.
+You can see the full options list in the script itself
+
+> **Supported distros:**  
+> Ubuntu:20.04/22.04/24.04, Debian:11/12, Rocky Linux:8/9
+
+
 
-Tested for: Ubuntu:20.04/22.04, CentOS:7, Debian:10/11, RockyLinux:8

BUILD.md

@@ -47,9 +47,20 @@ include(columnstore_version)
 include(configureEngine)
 include(compiler_flags)
 include(misc)
+include(cpack_manage)
+include(selinux_policy)
+
+if(NOT __msg1_CS_NO_CXX20)
+    add_subdirectory(dbcon/mysql)
+endif()
+if(NOT TARGET columnstore)
+    return()
+endif()
+# releasenum is used by external scripts for various tasks. Leave it alone.
+columnstore_install_file(${CMAKE_CURRENT_BINARY_DIR}/build/releasenum ${ENGINE_SUPPORTDIR})
+columnstore_install_file(${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine ${ENGINE_SUPPORTDIR})
 
 set(COMPONENTS
-    dbcon/mysql
     utils
     oam/oamcpp
     dbcon/execplan

CMakeLists.txt

@@ -1,4 +1,4 @@
 COLUMNSTORE_VERSION_MAJOR=23
 COLUMNSTORE_VERSION_MINOR=10
-COLUMNSTORE_VERSION_PATCH=4
+COLUMNSTORE_VERSION_PATCH=6
 COLUMNSTORE_VERSION_RELEASE=1

VERSION

@@ -0,0 +1,4 @@
+extern "C" const char* __asan_default_options()
+{
+  return "@COLUMNSTORE_STANDALONE_BINARIES_ASAN_COPTIONS@";
+}