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.9 into 10.10

Browse Source
This commit is contained in:
Marko Mäkelä
2022-06-09 15:26:09 +03:00
parent 978eb616ca 6dea701e0f
commit 32edabd1f2
313 changed files with 9849 additions and 10539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/spider/mysql-test/spider/bugfix/r/index.result
View File

@@ -14,6 +14,8 @@ SOCKET '$MASTER_1_MYSOCK'
SET spider_internal_sql_log_off= 0;
SET spider_direct_order_limit= 10000;
SET spider_init_sql_alloc_size= 1;
Warnings:
Warning 1287 '@@spider_init_sql_alloc_size' is deprecated and will be removed in a future release
for child2
for child3
create database auto_test_local;

2
storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.test
View File

@@ -134,6 +134,7 @@ DROP TABLE tbl_a;
--echo # COMMENT + engine-defined option (invalid)
--connection master_1
--replace_result error: error
--error ER_CANT_CREATE_TABLE
eval CREATE TABLE tbl_a (
a INT,
@@ -142,6 +143,7 @@ eval CREATE TABLE tbl_a (
) $MASTER_1_ENGINE $MASTER_1_CHARSET
REMOTE_SERVER="s_2_1" REMOTE_TABLE="tbl_a" COMMENT='tbl "tbl_b"';
--replace_result error: error
--error ER_CANT_CREATE_TABLE
eval CREATE TABLE tbl_a (
a INT,

15
storage/spider/mysql-test/spider/r/variable_deprecation.result
View File

@@ -150,6 +150,21 @@ Warnings:
Warning 1287 The table parameter 'buffer_size' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
# MDEV-27926 Deprecate spider_init_sql_alloc_size
SET spider_init_sql_alloc_size = 1;
Warnings:
Warning 1287 '@@spider_init_sql_alloc_size' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_init_sql_alloc_size";
Variable_name Value
spider_init_sql_alloc_size 1
CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='isa "1"';
Warnings:
Warning 1287 The table parameter 'isa' is deprecated and will be removed in a future release
CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='init_sql_alloc_size "1"';
Warnings:
Warning 1287 The table parameter 'init_sql_alloc_size' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
DROP DATABASE auto_test_local;
for master_1
for child2

6
storage/spider/mysql-test/spider/t/partition_mrr.test
View File

@@ -179,21 +179,21 @@ if ($USE_CHILD_GROUP2)
--connection child2_1
if ($USE_GENERAL_LOG)
{
--replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
--replace_regex /tmp_spider_bka_(0x)?[0-9a-f]*/tmp_spider_bka_xxxx/
eval $CHILD2_1_SELECT_ARGUMENT1;
}
eval $CHILD2_1_SELECT_TABLES;
--connection child2_2
if ($USE_GENERAL_LOG)
{
--replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
--replace_regex /tmp_spider_bka_(0x)?[0-9a-f]*/tmp_spider_bka_xxxx/
eval $CHILD2_2_SELECT_ARGUMENT1;
}
eval $CHILD2_2_SELECT_TABLES;
--connection child2_3
if ($USE_GENERAL_LOG)
{
--replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/
--replace_regex /tmp_spider_bka_(0x)?[0-9a-f]*/tmp_spider_bka_xxxx/
eval $CHILD2_3_SELECT_ARGUMENT1;
}
eval $CHILD2_3_SELECT_TABLES;

9
storage/spider/mysql-test/spider/t/variable_deprecation.test
View File

@@ -93,6 +93,15 @@ eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='buffer_size "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
--echo # MDEV-27926 Deprecate spider_init_sql_alloc_size
SET spider_init_sql_alloc_size = 1;
SHOW VARIABLES LIKE "spider_init_sql_alloc_size";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='isa "1"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='init_sql_alloc_size "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
DROP DATABASE auto_test_local;
--disable_query_log