database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation

Browse Source 
fix the patch. add tests
This commit is contained in:
Sergei Golubchik
2017-03-04 17:17:00 +01:00
parent c372388e48
commit 3d06f0f72c
10 changed files with 546 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mysql-test/t/mysql_upgrade_noengine.test Normal file
View File

@ -0,0 +1,56 @@
#
# MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation
#
source include/have_innodb.inc;
source include/not_embedded.inc;
if (!$HA_BLACKHOLE_SO) {
skip Need blackhole plugin;
}
if (!$HA_ARCHIVE_SO) {
skip Need Archive plugin;
}
let $datadir= `select @@datadir`;
install soname 'ha_blackhole';
install soname 'ha_archive';
vertical_results;
create table t1 (a int) engine=blackhole;
create table t2 (a int) engine=archive;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
flush tables;
uninstall plugin blackhole;
uninstall plugin archive;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
# upgrade from 10.1 - engines aren't enabled
exec $MYSQL_UPGRADE 2>&1;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
# pretend it's an upgrade from 10.0
alter table mysql.user drop column default_role, drop column max_statement_time;
# but mysql_upgrade_info tells otherwise
remove_file $datadir/mysql_upgrade_info;
write_file $datadir/mysql_upgrade_info;
10.1.10-MariaDB
EOF
# still upgrade from 10.1
exec $MYSQL_UPGRADE 2>&1;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
alter table mysql.user drop column default_role, drop column max_statement_time;
remove_file $datadir/mysql_upgrade_info;
# upgrade from 10.0 - engines are enabled
exec $MYSQL_UPGRADE 2>&1;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
drop table t1, t2;
uninstall plugin blackhole;
uninstall plugin archive;