Skip to content

Commit c33ca17

Browse files
mariadb-YuchenPeimariadb-YuchenPei
committed
Merge branch '10.4' into 10.5
2 parents 13dd787 + ba94778 commit c33ca17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+881
-683
lines changed

‎storage/spider/mysql-test/spider/bugfix/r/mdev_22979.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
MDEV-22979 "mysqld --bootstrap" / mysql_install_db hangs when Spider is installed
2+
# Kill the server
3+
# restart
4+
Warnings:
5+
Note 1305 SONAME ha_spider.so does not exist

‎storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DROP FUNCTION spider_copy_tables;
77
DROP FUNCTION spider_ping_table;
88
DROP FUNCTION spider_bg_direct_sql;
99
DROP FUNCTION spider_direct_sql;
10-
UNINSTALL SONAME IF EXISTS "ha_spider";
10+
UNINSTALL SONAME IF EXISTS 'ha_spider';
1111
DROP TABLE IF EXISTS mysql.spider_xa;
1212
DROP TABLE IF EXISTS mysql.spider_xa_member;
1313
DROP TABLE IF EXISTS mysql.spider_xa_failed_log;

‎storage/spider/mysql-test/spider/bugfix/r/mdev_27233.result

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#
2+
# MDEV-27233 Server hangs when using --init-file which loads Spider and creates a Spider table
3+
#
4+
show create table t;
5+
Table Create Table
6+
t CREATE TABLE `t` (
7+
`c` int(11) DEFAULT NULL
8+
) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
9+
Warnings:
10+
Error 1429 Unable to connect to foreign data source: localhost
11+
Error 1429 Unable to connect to foreign data source: localhost

‎storage/spider/mysql-test/spider/bugfix/r/mdev_28218.result

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#
2+
# MDEV-28218 Spider: thread hang/deadlock as result of INSTALL PLUGIN and DROP TABLE
3+
#
4+
INSTALL SONAME 'ha_spider.so';
5+
DROP TABLE IF EXISTS mysql.spider_tables;
6+
show create table mysql.spider_tables;
7+
ERROR 42S02: Table 'mysql.spider_tables' doesn't exist
8+
Warnings:
9+
Note 1051 Unknown table 'mysql.spider_tables'

‎storage/spider/mysql-test/spider/bugfix/r/mdev_28218_init_file.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# MDEV-28218 Spider: thread hang/deadlock as result of INSTALL PLUGIN and DROP TABLE
3+
#
4+
show create table mysql.spider_tables;
5+
ERROR 42S02: Table 'mysql.spider_tables' doesn't exist

‎storage/spider/mysql-test/spider/bugfix/r/mdev_28218_mixed.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# MDEV-28218 Spider: thread hang/deadlock as result of INSTALL PLUGIN and DROP TABLE
3+
#
4+
show create table mysql.spider_tables;
5+
ERROR 42S02: Table 'mysql.spider_tables' doesn't exist

‎storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
#
22
# MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
33
#
4+
call mtr.add_suppression(".*\\[Warning\\] InnoDB: Skipping buffer pool dump/restore during wsrep recovery");
5+
# Kill the server
6+
# restart
7+
Warnings:
8+
Note 1305 SONAME ha_spider.so does not exist

‎storage/spider/mysql-test/spider/bugfix/r/mdev_32683.result

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# MDEV-32683 Spider engine does not load with non-default alter-algorithm
3+
#
4+
set global alter_algorithm=INSTANT;
5+
install plugin spider soname 'ha_spider';
6+
select plugin_name, plugin_status, plugin_type, plugin_license, load_option from information_schema.plugins where plugin_name like 'spider';
7+
plugin_name plugin_status plugin_type plugin_license load_option
8+
SPIDER ACTIVE STORAGE ENGINE GPL ON
9+
uninstall plugin spider;
10+
drop table mysql.spider_link_failed_log, mysql.spider_link_mon_servers, mysql.spider_tables, mysql.spider_table_crd, mysql.spider_table_position_for_recovery, mysql.spider_table_sts, mysql.spider_xa, mysql.spider_xa_failed_log, mysql.spider_xa_member;
11+
drop function spider_direct_sql;
12+
drop function spider_bg_direct_sql;
13+
drop function spider_ping_table;
14+
drop function spider_copy_tables;
15+
drop function spider_flush_table_mon_cache;
16+
set global alter_algorithm=DEFAULT;

‎storage/spider/mysql-test/spider/bugfix/r/mdev_32753.result

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#
2+
# MDEV-32753 Spider engine does not load in ORACLE mode
3+
#
4+
select * from mysql.plugin;
5+
name dl
6+
create table t (c int) Engine=SPIDER;
7+
drop table t;
8+
#
9+
# end of test mdev_32753
10+
#

‎storage/spider/mysql-test/spider/bugfix/r/mdev_32753_after_start.result

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#
2+
# MDEV-32753 Spider engine does not load in ORACLE mode
3+
#
4+
install soname 'ha_spider';
5+
select * from mysql.plugin;
6+
name dl
7+
SPIDER ha_spider.so
8+
SPIDER_ALLOC_MEM ha_spider.so
9+
SPIDER_WRAPPER_PROTOCOLS ha_spider.so
10+
create table t (c int) Engine=SPIDER;
11+
drop table t;
12+
#
13+
# end of test mdev_32753_after_start
14+
#

0 commit comments

Comments
 (0)