diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-21 13:44:16 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-21 13:44:16 +0300 |
commit | 2a3fe45dd2df047cc0d66e2bcdbadd5005c85a1a (patch) | |
tree | 0d00d4685c60baa325d12d5103fbf72253682bbc /debian/additions | |
parent | 99e017d09945d04e8f43d3b74ecc556e809613a2 (diff) | |
download | mariadb-git-2a3fe45dd2df047cc0d66e2bcdbadd5005c85a1a.tar.gz |
Remove XtraDB
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.
Diffstat (limited to 'debian/additions')
-rwxr-xr-x | debian/additions/mysqlreport | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/debian/additions/mysqlreport b/debian/additions/mysqlreport index 64eaf93783a..6588b17f808 100755 --- a/debian/additions/mysqlreport +++ b/debian/additions/mysqlreport @@ -143,7 +143,6 @@ my $have_subquerycache_vals = 0; my $have_binlog_vals = 0; my $have_tokudb_engine = 0; my $use_thread_pool = 0; -my $use_xtradb = 0; if(defined $op{'r'}) { @@ -699,15 +698,6 @@ sub get_MySQL_version } else { $have_tokudb_engine = 0; } - - $use_xtradb = $dbh->selectall_arrayref("SELECT 1 FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE = 'InnoDB' AND COMMENT LIKE 'Percona-XtraDB%';", undef)->[0][0]; - if(defined($use_xtradb) && $use_xtradb eq "1") - { - print "XtraDB detected\n" if $op{debug}; - $use_xtradb = 1; - } else { - $use_xtradb = 0; - } } } @@ -1204,11 +1194,6 @@ sub write_InnoDB $~ = 'IB'; write; - if($use_xtradb) - { - $~ = 'IB_XTRADB'; - write; - } # Innodb_row_lock_ values were added in MySQL 5.0.3 if($MySQL_version >= 50003) @@ -1216,11 +1201,6 @@ sub write_InnoDB $~ = 'IB_LOCK'; write; } - if($use_xtradb) - { - $~ = 'IB_LOCK_XTRADB'; - write; - } # Data, Pages, Rows $~ = 'IB_DPR'; @@ -1511,11 +1491,6 @@ Flushes @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_buffer_pool_pages_flushed'}), t($stats{'Innodb_buffer_pool_pages_flushed'}) . -format IB_XTRADB = - LRU @>>>>>>>> @>>>>>/s %LRU: @>>>>> -make_short($stats{'Innodb_buffer_pool_pages_lru_flushed'}), t($stats{'Innodb_buffer_pool_pages_lru_flushed'}), perc($stats{'Innodb_buffer_pool_pages_lru_flushed'}, $stats{'Innodb_buffer_pool_pages_flushed'}) -. - format IB_LOCK = __ InnoDB Lock _________________________________________________________ @@ -1532,11 +1507,6 @@ $stats{'Innodb_row_lock_time_avg'} $stats{'Innodb_row_lock_time_max'} . -format IB_LOCK_XTRADB = -Trx history @>>>>>>>> -make_short($stats{'Innodb_history_list_length'}) -. - format IB_DPR = __ InnoDB Data, Pages, Rows ____________________________________________ |