mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '10.6' into mariadb-10.6.17

Browse source
This commit is contained in:
Oleksandr Byelkin 2024-02-06 22:45:22 +01:00
commit d337700cc0
7 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=6
MYSQL_VERSION_PATCH=17
MYSQL_VERSION_PATCH=18
SERVER_MATURITY=stable

3
cmake/pcre.cmake
View file

@ -4,6 +4,9 @@ SET(WITH_PCRE "auto" CACHE STRING
"Which pcre to use (possible values are 'bundled', 'system', or 'auto')")
MACRO(BUNDLE_PCRE2)
SET(WITH_PCRE "bundled" CACHE STRING
"Which pcre to use (possible values are 'bundled', 'system', or 'auto')")
SET(dir "${CMAKE_BINARY_DIR}/extra/pcre2")
SET(PCRE_INCLUDE_DIRS ${dir}/src/pcre2-build ${dir}/src/pcre2/src)
MESSAGE(STATUS "Will download and bundle pcre2")

2
debian/mariadb-server-10.6.mariadb.init vendored
View file

@ -88,7 +88,7 @@ sanity_checks() {
# If datadir location is not changed int configuration
# then it's not printed with /usr/sbin/mariadbd --print-defaults
# then we use 'sane' default.
if [ -z "$datadir"]
if [ -z "$datadir" ]
then
datadir="/var/lib/mysql"
fi

4
mysql-test/lib/mtr_report.pm
View file

@ -87,12 +87,16 @@ sub flush_out {
$out_line = "";
}
use if $^O eq "MSWin32", "threads::shared";
my $flush_lock :shared;
# Print to stdout
sub print_out {
if(IS_WIN32PERL) {
$out_line .= $_[0];
# Flush buffered output on new lines.
if (rindex($_[0], "\n") != -1) {
lock($flush_lock);
flush_out();
}
} else {

4
storage/spider/mysql-test/spider/bugfix/r/mdev_33242.result Normal file
View file

@ -0,0 +1,4 @@
set @old_old_mode=@@global.old_mode;
set global old_mode=4;
INSTALL SONAME 'ha_spider.so';
set global old_mode=@old_old_mode;

6
storage/spider/mysql-test/spider/bugfix/t/mdev_33242.test Normal file
View file

@ -0,0 +1,6 @@
set @old_old_mode=@@global.old_mode;
set global old_mode=4;
INSTALL SONAME 'ha_spider.so';
set global old_mode=@old_old_mode;
--disable_query_log
--source ../../include/clean_up_spider.inc

3
storage/spider/spd_init_query.h
View file

@ -23,6 +23,9 @@ static LEX_STRING spider_init_queries[] = {
{C_STRING_WITH_LEN(
"SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ORACLE', '');"
)},
{C_STRING_WITH_LEN(
"SET @@OLD_MODE = CONCAT(@@OLD_MODE, ',UTF8_IS_UTF8MB3');"
)},
{C_STRING_WITH_LEN(
"create table if not exists mysql.spider_xa("
" format_id int not null default 0,"