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

Remove XtraDB

Browse Source 
The XtraDB storage engine was already replaced by InnoDB
and disabled in MariaDB Server 10.2. Let us remove it altogether
to avoid dragging dead code around.

Replace some references to XtraDB with references to InnoDB.

rpl_get_position_info(): Remove.

Remove the mysql-test-run --suite=percona, because it only contains
tests specific to XtraDB, many of which were disabled already in
earlier MariaDB versions.
This commit is contained in:
Marko Mäkelä
2017-06-21 13:44:16 +03:00
parent 99e017d099
commit 2a3fe45dd2
702 changed files with 20 additions and 369696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/sys_vars/t/all_vars.test
View File

@@ -12,7 +12,7 @@ eval INSTALL PLUGIN blackhole SONAME "$HA_BLACKHOLE_SO";
eval INSTALL PLUGIN federated SONAME "$HA_FEDERATEDX_SO";
eval INSTALL PLUGIN oqgraph SONAME "$HA_OQGRAPH_SO";
eval INSTALL PLUGIN sphinx SONAME "$HA_SPHINX_SO";
eval INSTALL PLUGIN innodb SONAME "$HA_XTRADB_SO";
eval INSTALL PLUGIN innodb SONAME "$HA_INNODB_SO";
eval INSTALL PLUGIN rpl_semi_sync_master SONAME "$SEMISYNC_MASTER_SO";
eval INSTALL PLUGIN rpl_semi_sync_slave SONAME "$SEMISYNC_SLAVE_SO";
--enable_abort_on_error

1
mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_blocking_buffer_pool_restore_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_buffer_pool_populate_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_fake_changes_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

12
mysql-test/suite/sys_vars/t/innodb_flush_checkpoint_debug_basic.test
View File

@@ -1,12 +0,0 @@
--source include/have_debug.inc
--source include/have_xtradb.inc
SELECT @@global.innodb_flush_checkpoint_debug;
SET @@global.innodb_flush_checkpoint_debug=1;
SELECT @@global.innodb_flush_checkpoint_debug;
SET @@global.innodb_flush_checkpoint_debug=0;
SELECT @@global.innodb_flush_checkpoint_debug;
--error ER_GLOBAL_VARIABLE
SET @@session.innodb_flush_checkpoint_debug=1;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.innodb_flush_checkpoint_debug;

1
mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_kill_idle_transaction_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

51
mysql-test/suite/sys_vars/t/innodb_sched_priority_cleaner_basic.test
View File

@@ -1,51 +0,0 @@
--source include/have_xtradb.inc
--source include/linux.inc
--source include/not_embedded.inc
# A dynamic, global variable
# Test in read-only mode
--let $restart_parameters= --innodb-read-only
--source include/restart_mysqld.inc
--let $restart_parameters=
# This has no actual effect in innodb_read_only mode
SET GLOBAL innodb_sched_priority_cleaner=39;
--source include/restart_mysqld.inc
# Default value
SELECT @@GLOBAL.innodb_sched_priority_cleaner;
# Global only
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@SESSION.innodb_sched_priority_cleaner;
# Correct values
# The high priority values may need permissions, thus do not test them
# SET GLOBAL innodb_sched_priority_cleaner=39;
# SELECT @@GLOBAL.innodb_sched_priority_cleaner;
#SET GLOBAL innodb_sched_priority_cleaner=34;
# SELECT @@GLOBAL.innodb_sched_priority_cleaner;
SET GLOBAL innodb_sched_priority_cleaner=19;
SELECT @@GLOBAL.innodb_sched_priority_cleaner;
SET GLOBAL innodb_sched_priority_cleaner=5;
SELECT @@GLOBAL.innodb_sched_priority_cleaner;
SET GLOBAL innodb_sched_priority_cleaner=0;
SELECT @@GLOBAL.innodb_sched_priority_cleaner;
# Incorrect values
SET GLOBAL innodb_sched_priority_cleaner=-1;
SELECT @@GLOBAL.innodb_sched_priority_cleaner;
#SET GLOBAL innodb_sched_priority_cleaner=40;
#SELECT @@GLOBAL.innodb_sched_priority_cleaner;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_cleaner=1.1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_cleaner=1e1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_cleaner='foo';
# If we are lacking permissions, then we cannot restore the startup value
# at the end.
--source include/restart_mysqld.inc

44
mysql-test/suite/sys_vars/t/innodb_sched_priority_io_basic.test
View File

@@ -1,44 +0,0 @@
--source include/have_debug.inc
--source include/have_xtradb.inc
--source include/linux.inc
--source include/not_embedded.inc
# A dynamic, global variable
SET @start_value = @@GLOBAL.innodb_sched_priority_io;
# Default value
SELECT @@GLOBAL.innodb_sched_priority_io;
# Global only
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@SESSION.innodb_sched_priority_io;
# Correct values
# The high priority values may need permissions, thus do not test them
# SET GLOBAL innodb_sched_priority_io=39;
# SELECT @@GLOBAL.innodb_sched_priority_io;
#SET GLOBAL innodb_sched_priority_io=34;
# SELECT @@GLOBAL.innodb_sched_priorit_io;
SET GLOBAL innodb_sched_priority_io=19;
SELECT @@GLOBAL.innodb_sched_priority_io;
SET GLOBAL innodb_sched_priority_io=5;
SELECT @@GLOBAL.innodb_sched_priority_io;
SET GLOBAL innodb_sched_priority_io=0;
SELECT @@GLOBAL.innodb_sched_priority_io;
# Incorrect values
SET GLOBAL innodb_sched_priority_io=-1;
SELECT @@GLOBAL.innodb_sched_priority_io;
#SET GLOBAL innodb_sched_priority_io=40;
#SELECT @@GLOBAL.innodb_sched_priority_io;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_io=1.1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_io=1e1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_io='foo';
# If we are lacking permissions, then we cannot restore the startup value
# at the end.
--source include/restart_mysqld.inc

44
mysql-test/suite/sys_vars/t/innodb_sched_priority_master_basic.test
View File

@@ -1,44 +0,0 @@
--source include/have_debug.inc
--source include/have_xtradb.inc
--source include/linux.inc
--source include/not_embedded.inc
# A dynamic, global variable
SET @start_value = @@GLOBAL.innodb_sched_priority_master;
# Default value
SELECT @@GLOBAL.innodb_sched_priority_master;
# Global only
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@SESSION.innodb_sched_priority_master;
# Correct values
# The high priority values may need permissions, thus do not test them
# SET GLOBAL innodb_sched_priority_master=39;
# SELECT @@GLOBAL.innodb_sched_priority_master;
#SET GLOBAL innodb_sched_priority_master=34;
# SELECT @@GLOBAL.innodb_sched_priority_master;
SET GLOBAL innodb_sched_priority_master=19;
SELECT @@GLOBAL.innodb_sched_priority_master;
SET GLOBAL innodb_sched_priority_master=5;
SELECT @@GLOBAL.innodb_sched_priority_master;
SET GLOBAL innodb_sched_priority_master=0;
SELECT @@GLOBAL.innodb_sched_priority_master;
# Incorrect values
SET GLOBAL innodb_sched_priority_master=-1;
SELECT @@GLOBAL.innodb_sched_priority_master;
#SET GLOBAL innodb_sched_priority_master=40;
#SELECT @@GLOBAL.innodb_sched_priority_master;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_master=1.1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_master=1e1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_master='foo';
# If we are lacking permissions, then we cannot restore the startup value
# at the end.
--source include/restart_mysqld.inc

44
mysql-test/suite/sys_vars/t/innodb_sched_priority_purge_basic.test
View File

@@ -1,44 +0,0 @@
--source include/have_debug.inc
--source include/have_xtradb.inc
--source include/linux.inc
--source include/not_embedded.inc
# A dynamic, global variable
SET @start_value = @@GLOBAL.innodb_sched_priority_purge;
# Default value
SELECT @@GLOBAL.innodb_sched_priority_purge;
# Global only
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@SESSION.innodb_sched_priority_purge;
# Correct values
# The high priority values may need permissions, thus do not test them
# SET GLOBAL innodb_sched_priority_purge=39;
# SELECT @@GLOBAL.innodb_sched_priority_purge;
#SET GLOBAL innodb_sched_priority_purge=34;
# SELECT @@GLOBAL.innodb_sched_priority_purge;
SET GLOBAL innodb_sched_priority_purge=19;
SELECT @@GLOBAL.innodb_sched_priority_purge;
SET GLOBAL innodb_sched_priority_purge=5;
SELECT @@GLOBAL.innodb_sched_priority_purge;
SET GLOBAL innodb_sched_priority_purge=0;
SELECT @@GLOBAL.innodb_sched_priority_purge;
# Incorrect values
SET GLOBAL innodb_sched_priority_purge=-1;
SELECT @@GLOBAL.innodb_sched_priority_purge;
#SET GLOBAL innodb_sched_priority_purge=40;
#SELECT @@GLOBAL.innodb_sched_priority_purge;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_purge=1.1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_purge=1e1;
--error ER_WRONG_TYPE_FOR_VAR
SET GLOBAL innodb_sched_priority_purge='foo';
# If we are lacking permissions, then we cannot restore the startup value
# at the end.
--source include/restart_mysqld.inc

1
mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

5
mysql-test/suite/sys_vars/t/innodb_tmpdir_basic.test
View File

@@ -1,10 +1,5 @@
--source include/have_innodb.inc
if (`select plugin_auth_version <= "5.6.28-MariaDB-76.1" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.6.28-MariaDB-76.1 or earlier
}
SET @start_global_value = @@global.innodb_tmpdir;
SELECT @start_global_value;

18
mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test
View File

@@ -1,18 +0,0 @@
# Tests for innodb_track_changed_pages variable
--source include/have_xtradb.inc
SELECT COUNT(@@GLOBAL.innodb_track_changed_pages);
SELECT @@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='innodb_track_changed_pages';
SELECT @@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT COUNT(@@SESSION.innodb_track_changed_pages);
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT COUNT(@@LOCAL.innodb_track_changed_pages);
--error ER_BAD_FIELD_ERROR
SELECT innodb_track_changed_pages = @@SESSION.innodb_track_changed_pages;

1
mysql-test/suite/sys_vars/t/innodb_track_redo_log_now_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension

56
mysql-test/suite/sys_vars/t/innodb_use_stacktrace_basic.test
View File

@@ -1,56 +0,0 @@
--source include/have_xtradb.inc
SELECT COUNT(@@GLOBAL.innodb_use_stacktrace);
--echo 1 Expected
####################################################################
# Check if Value can set #
####################################################################
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@GLOBAL.innodb_use_stacktrace=1;
--echo Expected error 'Read only variable'
SELECT COUNT(@@GLOBAL.innodb_use_stacktrace);
--echo 1 Expected
#################################################################
# Check if the value in GLOBAL Table matches value in variable #
#################################################################
SELECT IF(@@GLOBAL.innodb_use_stacktrace, 'ON', 'OFF') = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='innodb_use_stacktrace';
--echo 1 Expected
SELECT COUNT(@@GLOBAL.innodb_use_stacktrace);
--echo 1 Expected
SELECT COUNT(VARIABLE_VALUE)
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='innodb_use_stacktrace';
--echo 1 Expected
################################################################################
# Check if accessing variable with and without GLOBAL point to same variable #
################################################################################
SELECT @@innodb_use_stacktrace = @@GLOBAL.innodb_use_stacktrace;
--echo 1 Expected
SELECT COUNT(@@innodb_use_stacktrace);
--echo 1 Expected
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT COUNT(@@local.innodb_use_stacktrace);
--echo Expected error 'Variable is a GLOBAL variable'
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT COUNT(@@SESSION.innodb_use_stacktrace);
--echo Expected error 'Variable is a GLOBAL variable'
SELECT COUNT(@@GLOBAL.innodb_use_stacktrace);
--echo 1 Expected
--Error ER_BAD_FIELD_ERROR
SELECT innodb_use_stacktrace = @@SESSION.innodb_use_stacktrace;
--echo Expected error 'Readonly variable'

1
mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test
View File

@@ -1 +0,0 @@
--echo XtraDB extension