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.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2023-11-24 11:20:56 +02:00
parent edb98da79a a48c1b89c8
commit 5b6134b040
165 changed files with 2019 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/spider/mysql-test/spider/bugfix/r/mdev_32753.result Normal file
View File

@@ -0,0 +1,10 @@
#
# MDEV-32753 Spider engine does not load in ORACLE mode
#
select * from mysql.plugin;
name dl
create table t (c int) Engine=SPIDER;
drop table t;
#
# end of test mdev_32753
#

14
storage/spider/mysql-test/spider/bugfix/r/mdev_32753_after_start.result Normal file
View File

@@ -0,0 +1,14 @@
#
# MDEV-32753 Spider engine does not load in ORACLE mode
#
install soname 'ha_spider';
select * from mysql.plugin;
name dl
SPIDER ha_spider.so
SPIDER_ALLOC_MEM ha_spider.so
SPIDER_WRAPPER_PROTOCOLS ha_spider.so
create table t (c int) Engine=SPIDER;
drop table t;
#
# end of test mdev_32753_after_start
#

17
storage/spider/mysql-test/spider/bugfix/r/mdev_32753_after_start_session.result Normal file
View File

@@ -0,0 +1,17 @@
#
# MDEV-32753 Spider engine does not load in ORACLE mode
#
set @old_sql_mode=@@sql_mode;
SET @@sql_mode = CONCAT(@@sql_mode, ',ORACLE');
install soname 'ha_spider';
select * from mysql.plugin;
name dl
SPIDER ha_spider.so
SPIDER_ALLOC_MEM ha_spider.so
SPIDER_WRAPPER_PROTOCOLS ha_spider.so
create table t (c int) Engine=SPIDER;
drop table t;
set sql_mode=@old_sql_mode;
#
# end of test mdev_32753_after_start
#

2
storage/spider/mysql-test/spider/bugfix/t/mdev_32753.opt Normal file
View File

@@ -0,0 +1,2 @@
--sql-mode=oracle
--plugin-load-add=ha_spider

12
storage/spider/mysql-test/spider/bugfix/t/mdev_32753.test Normal file
View File

@@ -0,0 +1,12 @@
--echo #
--echo # MDEV-32753 Spider engine does not load in ORACLE mode
--echo #
# This test tests spider init during server startup under global
# ORACLE mode
select * from mysql.plugin;
create table t (c int) Engine=SPIDER;
drop table t;
--echo #
--echo # end of test mdev_32753
--echo #

1
storage/spider/mysql-test/spider/bugfix/t/mdev_32753_after_start.opt Normal file
View File

@@ -0,0 +1 @@
--sql-mode=oracle

19
storage/spider/mysql-test/spider/bugfix/t/mdev_32753_after_start.test Normal file
View File

@@ -0,0 +1,19 @@
--echo #
--echo # MDEV-32753 Spider engine does not load in ORACLE mode
--echo #
# This test tests spider init after startup under global ORACLE mode
install soname 'ha_spider';
select * from mysql.plugin;
create table t (c int) Engine=SPIDER;
drop table t;
--disable_query_log
--disable_result_log
--source ../../include/clean_up_spider.inc
--enable_result_log
--enable_query_log
--echo #
--echo # end of test mdev_32753_after_start
--echo #

22
storage/spider/mysql-test/spider/bugfix/t/mdev_32753_after_start_session.test Normal file
View File

@@ -0,0 +1,22 @@
--echo #
--echo # MDEV-32753 Spider engine does not load in ORACLE mode
--echo #
# This test tests spider init after startup under session ORACLE mode
set @old_sql_mode=@@sql_mode;
SET @@sql_mode = CONCAT(@@sql_mode, ',ORACLE');
install soname 'ha_spider';
select * from mysql.plugin;
create table t (c int) Engine=SPIDER;
drop table t;
set sql_mode=@old_sql_mode;
--disable_query_log
--disable_result_log
--source ../../include/clean_up_spider.inc
--enable_result_log
--enable_query_log
--echo #
--echo # end of test mdev_32753_after_start
--echo #

2
storage/spider/mysql-test/spider/include/clean_up_spider.inc
View File

@@ -3,7 +3,7 @@ DROP FUNCTION spider_copy_tables;
DROP FUNCTION spider_ping_table;
DROP FUNCTION spider_bg_direct_sql;
DROP FUNCTION spider_direct_sql;
UNINSTALL SONAME IF EXISTS "ha_spider";
UNINSTALL SONAME IF EXISTS 'ha_spider';
DROP TABLE IF EXISTS mysql.spider_xa;
DROP TABLE IF EXISTS mysql.spider_xa_member;
DROP TABLE IF EXISTS mysql.spider_xa_failed_log;