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-05-25 09:15:08 +03:00
parent 956d93b581 1ace1075dc
commit 3cc8539d84
457 changed files with 14601 additions and 3153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,6 +150,21 @@ 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;
# MDEV-28560 Deprecate spider_buffer_size
SET spider_buffer_size = 1;
Warnings:
Warning 1287 '@@spider_buffer_size' is deprecated and will be removed in a future release
SHOW VARIABLES LIKE "spider_buffer_size";
Variable_name Value
spider_buffer_size 1
CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='bfz "1"';
Warnings:
Warning 1287 The table parameter 'bfz' is deprecated and will be removed in a future release
CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='buffer_size "1"';
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;
DROP DATABASE auto_test_local;
for master_1
for child2

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

@@ -92,6 +92,15 @@ eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='crd_weight "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
--echo # MDEV-28560 Deprecate spider_buffer_size
SET spider_buffer_size = 1;
SHOW VARIABLES LIKE "spider_buffer_size";
eval CREATE TABLE tbl_a (a INT) $MASTER_1_ENGINE COMMENT='bfz "1"';
eval CREATE TABLE tbl_b (a INT) $MASTER_1_ENGINE COMMENT='buffer_size "1"';
DROP TABLE tbl_a;
DROP TABLE tbl_b;
DROP DATABASE auto_test_local;
--disable_query_log