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.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2022-04-27 10:43:00 +03:00
parent 6948abb94c 638afc4acf
commit 133c2129cd
301 changed files with 9772 additions and 8644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/spider/mysql-test/spider/bugfix/disabled.def
View File

@@ -1 +1,2 @@
wait_timeout : MDEV-26045
mdev_27239 : failed with ASAN build

33
storage/spider/mysql-test/spider/bugfix/r/mdev_25116.result Normal file
View File

@@ -0,0 +1,33 @@
#
# MDEV-25116 Spider: IF(COUNT( trigger SQL Error (1054)_ Unknown column '' in field list
#
for master_1
for child2
child2_1
child2_2
child2_3
for child3
connection child2_1;
CREATE DATABASE auto_test_remote;
USE auto_test_remote;
CREATE TABLE tbl_a (id INT);
connection master_1;
CREATE DATABASE auto_test_local;
USE auto_test_local;
CREATE TABLE tbl_a (
id INT
) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
connection master_1;
SELECT IF(COUNT(id > 0),'Y','N') FROM tbl_a;
IF(COUNT(id > 0),'Y','N')
N
connection master_1;
DROP DATABASE IF EXISTS auto_test_local;
connection child2_1;
DROP DATABASE IF EXISTS auto_test_remote;
for master_1
for child2
child2_1
child2_2
child2_3
for child3

3
storage/spider/mysql-test/spider/bugfix/t/mdev_25116.cnf Normal file
View File

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

37
storage/spider/mysql-test/spider/bugfix/t/mdev_25116.test Normal file
View File

@@ -0,0 +1,37 @@
--echo #
--echo # MDEV-25116 Spider: IF(COUNT( trigger SQL Error (1054)_ Unknown column '' in field list
--echo #
--disable_query_log
--disable_result_log
--source ../../t/test_init.inc
--enable_result_log
--enable_query_log
--connection child2_1
CREATE DATABASE auto_test_remote;
USE auto_test_remote;
CREATE TABLE tbl_a (id INT);
--connection master_1
CREATE DATABASE auto_test_local;
USE auto_test_local;
eval CREATE TABLE tbl_a (
id INT
) $MASTER_1_ENGINE $MASTER_1_CHARSET COMMENT='table "tbl_a", srv "s_2_1"';
--connection master_1
SELECT IF(COUNT(id > 0),'Y','N') FROM tbl_a;
--connection master_1
DROP DATABASE IF EXISTS auto_test_local;
--connection child2_1
DROP DATABASE IF EXISTS auto_test_remote;
--disable_query_log
--disable_result_log
--source ../t/test_deinit.inc
--enable_query_log
--enable_result_log

8
storage/spider/mysql-test/spider/r/spider3_fixes.result
View File

@@ -200,6 +200,14 @@ id
5000
10000
connection master_1;
#
# MDEV-28225 Disallow user to create Spider temporary table
#
connection master_1;
CREATE TEMPORARY TABLE t1 (
a INT
) ENGINE=Spider;
ERROR HY000: Table storage engine 'SPIDER' does not support the create option 'TEMPORARY'
deinit
connection master_1;

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

@@ -28,6 +28,21 @@ Warnings:
Warning 1287 The table parameter 'use_handler' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
# MDEV-28297 Deprecate spider_internal_offset
SET spider_internal_offset = 1;
Warnings:
Warning 1287 '@@spider_internal_offset' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_internal_offset";
Variable_name Value
spider_internal_offset 1
CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='ios "1"';
Warnings:
Warning 1287 The table parameter 'ios' is deprecated and will be removed in a future release
CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='internal_offset "1"';
Warnings:
Warning 1287 The table parameter 'internal_offset' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
# MDEV-28005 Deprecate Spider plugin variables regarding UDFs
SET GLOBAL spider_udf_ds_bulk_insert_rows = 1;
Warnings:
@@ -74,6 +89,98 @@ Warnings:
Warning 1287 The table parameter 'internal_limit' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
# MDEV-28244 Deprecate spider_xa_register_mode
SET spider_xa_register_mode = 0;
Warnings:
Warning 1287 '@@spider_xa_register_mode' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_xa_register_mode";
Variable_name Value
spider_xa_register_mode 0
# MDEV-28007 Deprecate Spider plugin variables regarding statistics persistence
SET GLOBAL spider_store_last_sts = 0;
Warnings:
Warning 1287 '@@spider_store_last_sts' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_store_last_sts";
Variable_name Value
spider_store_last_sts 0
SET GLOBAL spider_store_last_crd = 0;
Warnings:
Warning 1287 '@@spider_store_last_crd' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_store_last_crd";
Variable_name Value
spider_store_last_crd 0
SET GLOBAL spider_load_sts_at_startup = 0;
Warnings:
Warning 1287 '@@spider_load_sts_at_startup' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_load_sts_at_startup";
Variable_name Value
spider_load_sts_at_startup 0
SET GLOBAL spider_load_crd_at_startup = 0;
Warnings:
Warning 1287 '@@spider_load_crd_at_startup' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_load_crd_at_startup";
Variable_name Value
spider_load_crd_at_startup 0
DROP TABLE tbl_a;
DROP TABLE tbl_b;
# MDEV-28008 Deprecate spider_crd_mode and spider_sts_mode
SET spider_crd_mode = 1;
Warnings:
Warning 1287 '@@spider_crd_mode' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_crd_mode";
Variable_name Value
spider_crd_mode 1
CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='cmd "3"';
Warnings:
Warning 1287 The table parameter 'cmd' is deprecated and will be removed in a future release
CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='crd_mode "3"';
Warnings:
Warning 1287 The table parameter 'crd_mode' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
SET spider_sts_mode = 1;
Warnings:
Warning 1287 '@@spider_sts_mode' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_sts_mode";
Variable_name Value
spider_sts_mode 1
CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='smd "3"';
Warnings:
Warning 1287 The table parameter 'smd' is deprecated and will be removed in a future release
CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='sts_mode "3"';
Warnings:
Warning 1287 The table parameter 'sts_mode' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
# MDEV-28010 Deprecate spider_crd_type and spider_crd_weight
SET spider_crd_type = 1;
Warnings:
Warning 1287 '@@spider_crd_type' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_crd_type";
Variable_name Value
spider_crd_type 1
CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='ctp "1"';
Warnings:
Warning 1287 The table parameter 'ctp' is deprecated and will be removed in a future release
CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='crd_type "1"';
Warnings:
Warning 1287 The table parameter 'crd_type' is deprecated and will be removed in a future release
DROP TABLE tbl_a;
DROP TABLE tbl_b;
SET spider_crd_weight = 1;
Warnings:
Warning 1287 '@@spider_crd_weight' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_crd_weight";
Variable_name Value
spider_crd_weight 1
CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='cwg "1"';
Warnings:
Warning 1287 The table parameter 'cwg' is deprecated and will be removed in a future release
CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='crd_weight "1"';
Warnings:
Warning 1287 The table parameter 'crd_weight' 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

10
storage/spider/mysql-test/spider/t/spider3_fixes.test
View File

@@ -266,6 +266,16 @@ if ($USE_CHILD_GROUP2)
}
--echo #
--echo # MDEV-28225 Disallow user to create Spider temporary table
--echo #
--connection master_1
--error ER_ILLEGAL_HA_CREATE_OPTION
CREATE TEMPORARY TABLE t1 (
a INT
) ENGINE=Spider;
--echo
--echo deinit
--disable_warnings

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

@@ -17,7 +17,15 @@ SET spider_use_handler = 3;
SHOW VARIABLES LIKE "spider_use_handler";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='uhd "3"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='use_handler "3"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
--echo # MDEV-28297 Deprecate spider_internal_offset
SET spider_internal_offset = 1;
SHOW VARIABLES LIKE "spider_internal_offset";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='ios "1"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='internal_offset "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
@@ -46,6 +54,60 @@ eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='internal_limit "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
--echo # MDEV-28244 Deprecate spider_xa_register_mode
SET spider_xa_register_mode = 0;
SHOW VARIABLES LIKE "spider_xa_register_mode";
--echo # MDEV-28007 Deprecate Spider plugin variables regarding statistics persistence
SET GLOBAL spider_store_last_sts = 0;
SHOW VARIABLES LIKE "spider_store_last_sts";
SET GLOBAL spider_store_last_crd = 0;
SHOW VARIABLES LIKE "spider_store_last_crd";
SET GLOBAL spider_load_sts_at_startup = 0;
SHOW VARIABLES LIKE "spider_load_sts_at_startup";
SET GLOBAL spider_load_crd_at_startup = 0;
SHOW VARIABLES LIKE "spider_load_crd_at_startup";
DROP TABLE tbl_a;
DROP TABLE tbl_b;
--echo # MDEV-28008 Deprecate spider_crd_mode and spider_sts_mode
SET spider_crd_mode = 1;
SHOW VARIABLES LIKE "spider_crd_mode";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='cmd "3"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='crd_mode "3"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
SET spider_sts_mode = 1;
SHOW VARIABLES LIKE "spider_sts_mode";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='smd "3"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='sts_mode "3"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
--echo # MDEV-28010 Deprecate spider_crd_type and spider_crd_weight
SET spider_crd_type = 1;
SHOW VARIABLES LIKE "spider_crd_type";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='ctp "1"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='crd_type "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
SET spider_crd_weight = 1;
SHOW VARIABLES LIKE "spider_crd_weight";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='cwg "1"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='crd_weight "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
DROP DATABASE auto_test_local;
--disable_query_log