database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-01-03 07:23:49 +02:00
parent 1df05a0854 a48d2ec866
commit c9db50b585
5 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.cc
View File

@@ -8701,10 +8701,12 @@ void set_server_version(char *buf, size_t size)
{ {
bool is_log= opt_log || global_system_variables.sql_log_slow || opt_bin_log; bool is_log= opt_log || global_system_variables.sql_log_slow || opt_bin_log;
bool is_debug= IF_DBUG(!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"), 0); bool is_debug= IF_DBUG(!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"), 0);
bool is_valgrind= IF_VALGRIND(!strstr(MYSQL_SERVER_SUFFIX_STR, "-valgrind"), 0);
strxnmov(buf, size - 1, strxnmov(buf, size - 1,
MYSQL_SERVER_VERSION, MYSQL_SERVER_VERSION,
MYSQL_SERVER_SUFFIX_STR, MYSQL_SERVER_SUFFIX_STR,
IF_EMBEDDED("-embedded", ""), IF_EMBEDDED("-embedded", ""),
is_valgrind ? "-valgrind" : "",
is_debug ? "-debug" : "", is_debug ? "-debug" : "",
is_log ? "-log" : "", is_log ? "-log" : "",
NullS); NullS);

21
storage/spider/mysql-test/spider/bugfix/r/mdev_27184.result Normal file
View File

@@ -0,0 +1,21 @@
#
# MDEV-27184 Assertion `(old_top == initial_top (av) && old_size == 0) ||
# ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) &&
# ((unsigned long) old_end & (pagesize - 1)) == 0)' failed,
# Assertion `str.alloced_length() >= str.length() + data_len' failed
#
for master_1
for child2
for child3
connection master_1;
CREATE DATABASE auto_test_remote;
USE auto_test_remote;
CREATE TABLE tbl_a (a FLOAT) ENGINE=SPIDER;
INSERT INTO tbl_a VALUES
(0xF5A7),(0xF5A8),(0xF5A9),(0xF5AA),(0xF5AB),(0xF5AC),(0xF5AD),(0xF5AE),
(0xF5A7),(0xF5A8),(0xF5A9),(0xF5AA),(0xF5AB),(0xF5AC),(0xF5AD),(0xF5AE);
ERROR HY000: Unable to connect to foreign data source: localhost
DROP DATABASE auto_test_remote;
for master_1
for child2
for child3

2
storage/spider/mysql-test/spider/bugfix/t/mdev_27184.cnf Normal file
View File

@@ -0,0 +1,2 @@
!include include/default_mysqld.cnf
!include ../my_1_1.cnf

31
storage/spider/mysql-test/spider/bugfix/t/mdev_27184.test Normal file
View File

@@ -0,0 +1,31 @@
--echo #
--echo # MDEV-27184 Assertion `(old_top == initial_top (av) && old_size == 0) ||
--echo # ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) &&
--echo # ((unsigned long) old_end & (pagesize - 1)) == 0)' failed,
--echo # Assertion `str.alloced_length() >= str.length() + data_len' failed
--echo #
--disable_query_log
--disable_result_log
--source ../../t/test_init.inc
--enable_result_log
--enable_query_log
--connection master_1
CREATE DATABASE auto_test_remote;
USE auto_test_remote;
CREATE TABLE tbl_a (a FLOAT) ENGINE=SPIDER;
--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE
INSERT INTO tbl_a VALUES
(0xF5A7),(0xF5A8),(0xF5A9),(0xF5AA),(0xF5AB),(0xF5AC),(0xF5AD),(0xF5AE),
(0xF5A7),(0xF5A8),(0xF5A9),(0xF5AA),(0xF5AB),(0xF5AC),(0xF5AD),(0xF5AE);
DROP DATABASE auto_test_remote;
--disable_query_log
--disable_result_log
--source ../../t/test_deinit.inc
--enable_result_log
--enable_query_log

2
storage/spider/spd_db_mysql.cc
View File

@@ -4384,7 +4384,7 @@ int spider_db_mariadb_util::append_column_value(
} else if (float_value) } else if (float_value)
{ {
if (str->reserve(SPIDER_SQL_CAST_LEN + ptr->length() + if (str->reserve(SPIDER_SQL_CAST_LEN + ptr->length() +
SPIDER_SQL_AS_FLOAT_LEN, SPIDER_SQL_CLOSE_PAREN_LEN)) SPIDER_SQL_AS_FLOAT_LEN + SPIDER_SQL_CLOSE_PAREN_LEN))
{ {
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }