Skip to content

Commit 9f83a88

Browse files
sanja-byelkinsanja-byelkin
committed
Merge branch '10.5' into mariadb-10.5.23
2 parents 9d8f659 + 8b84fb1 commit 9f83a88

26 files changed

+355
-26
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=10
22
MYSQL_VERSION_MINOR=5
3-
MYSQL_VERSION_PATCH=23
3+
MYSQL_VERSION_PATCH=24
44
SERVER_MATURITY=stable

‎client/mysql_upgrade.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,6 +1155,8 @@ static int install_used_plugin_data_types(void)
11551155
DYNAMIC_STRING ds_result;
11561156
const char *query = "SELECT table_comment FROM information_schema.tables"
11571157
" WHERE table_comment LIKE 'Unknown data type: %'";
1158+
if (opt_systables_only)
1159+
return 0;
11581160
if (init_dynamic_string(&ds_result, "", 512, 512))
11591161
die("Out of memory");
11601162
run_query(query, &ds_result, TRUE);

‎mysql-test/include/delete_anonymous_users.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Remove anonymous users added by add_anonymous_users.inc
22
disable_warnings;
33
disable_query_log;
4-
DELETE FROM mysql.user where host='localhost' and user='';
4+
DELETE FROM mysql.global_priv where host='localhost' and user='';
55
FLUSH PRIVILEGES;
66
enable_query_log;
77
enable_warnings;

‎mysql-test/main/mysql_json_mysql_upgrade.result renamed to ‎mysql-test/main/mysql_upgrade_mysql_json.result

File renamed without changes.

‎mysql-test/main/mysql_json_mysql_upgrade.test renamed to ‎mysql-test/main/mysql_upgrade_mysql_json.test

File renamed without changes.

‎mysql-test/main/mysql_upgrade_mysql_json_system_tables.result

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#
2+
# MDEV-32462: mysql_upgrade -s still checks for non system tables
3+
#
4+
call mtr.add_suppression("Table rebuild required");
5+
SET NAMES utf8;
6+
# mariadb_upgrade on system and user table
7+
show tables from mysql like '%json%';
8+
Tables_in_mysql (%json%)
9+
mysql_json_test
10+
use mysql;
11+
show create table mysql.mysql_json_test;
12+
ERROR HY000: Unknown data type: 'MYSQL_JSON'
13+
show create table test.mysql_json_test;
14+
ERROR HY000: Unknown data type: 'MYSQL_JSON'
15+
SET @old_general_log= @@global.general_log;
16+
SET @old_log_output= @@global.log_output;
17+
SET @@global.general_log = ON;
18+
SET @@global.log_output = "TABLE";
19+
The --upgrade-system-tables option was used, user tables won't be touched.
20+
Phase 1/7: Checking and upgrading mysql database
21+
Processing databases
22+
mysql
23+
mysql.column_stats OK
24+
mysql.columns_priv OK
25+
mysql.db OK
26+
mysql.event OK
27+
mysql.func OK
28+
mysql.global_priv OK
29+
mysql.gtid_slave_pos OK
30+
mysql.help_category OK
31+
mysql.help_keyword OK
32+
mysql.help_relation OK
33+
mysql.help_topic OK
34+
mysql.index_stats OK
35+
mysql.innodb_index_stats
36+
Error : Unknown storage engine 'InnoDB'
37+
error : Corrupt
38+
mysql.innodb_table_stats
39+
Error : Unknown storage engine 'InnoDB'
40+
error : Corrupt
41+
mysql.mysql_json_test
42+
Error : Unknown data type: 'MYSQL_JSON'
43+
error : Corrupt
44+
mysql.plugin OK
45+
mysql.proc OK
46+
mysql.procs_priv OK
47+
mysql.proxies_priv OK
48+
mysql.roles_mapping OK
49+
mysql.servers OK
50+
mysql.table_stats OK
51+
mysql.tables_priv OK
52+
mysql.time_zone OK
53+
mysql.time_zone_leap_second OK
54+
mysql.time_zone_name OK
55+
mysql.time_zone_transition OK
56+
mysql.time_zone_transition_type OK
57+
mysql.transaction_registry
58+
Error : Unknown storage engine 'InnoDB'
59+
error : Corrupt
60+
61+
Repairing tables
62+
mysql.innodb_index_stats
63+
Error : Unknown storage engine 'InnoDB'
64+
error : Corrupt
65+
mysql.innodb_table_stats
66+
Error : Unknown storage engine 'InnoDB'
67+
error : Corrupt
68+
mysql.mysql_json_test
69+
Error : Unknown data type: 'MYSQL_JSON'
70+
error : Corrupt
71+
mysql.transaction_registry
72+
Error : Unknown storage engine 'InnoDB'
73+
error : Corrupt
74+
Phase 2/7: Installing used storage engines... Skipped
75+
Phase 3/7: Fixing views... Skipped
76+
Phase 4/7: Running 'mysql_fix_privilege_tables'
77+
Phase 5/7: Fixing table and database names ... Skipped
78+
Phase 6/7: Checking and upgrading tables... Skipped
79+
Phase 7/7: Running 'FLUSH PRIVILEGES'
80+
OK
81+
SET @@global.general_log = @old_general_log;
82+
SET @@global.log_output = @old_log_output;
83+
select command_type, argument from mysql.general_log where argument like "%SELECT table_comment FROM information_schema.tables%";
84+
command_type argument
85+
show create table mysql.mysql_json_test;
86+
ERROR HY000: Unknown data type: 'MYSQL_JSON'
87+
show create table test.mysql_json_test;
88+
ERROR HY000: Unknown data type: 'MYSQL_JSON'
89+
drop table mysql.mysql_json_test;
90+
drop table test.mysql_json_test;
91+
#
92+
# End of 10.5 tests
93+
#

‎mysql-test/main/mysql_upgrade_mysql_json_system_tables.test

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
--echo #
2+
--echo # MDEV-32462: mysql_upgrade -s still checks for non system tables
3+
--echo #
4+
5+
# Let's now load plugin first
6+
--source include/have_utf8.inc
7+
--source include/not_embedded.inc
8+
9+
--source include/mysql_upgrade_preparation.inc
10+
call mtr.add_suppression("Table rebuild required");
11+
12+
SET NAMES utf8;
13+
14+
let $MYSQLD_DATADIR= `select @@datadir`;
15+
16+
--echo # mariadb_upgrade on system and user table
17+
--copy_file std_data/mysql_json/mysql_json_test.frm $MYSQLD_DATADIR/mysql/mysql_json_test.frm
18+
--copy_file std_data/mysql_json/mysql_json_test.MYI $MYSQLD_DATADIR/mysql/mysql_json_test.MYI
19+
--copy_file std_data/mysql_json/mysql_json_test.MYD $MYSQLD_DATADIR/mysql/mysql_json_test.MYD
20+
--copy_file std_data/mysql_json/mysql_json_test.frm $MYSQLD_DATADIR/test/mysql_json_test.frm
21+
--copy_file std_data/mysql_json/mysql_json_test.MYI $MYSQLD_DATADIR/test/mysql_json_test.MYI
22+
--copy_file std_data/mysql_json/mysql_json_test.MYD $MYSQLD_DATADIR/test/mysql_json_test.MYD
23+
24+
show tables from mysql like '%json%';
25+
use mysql;
26+
--error ER_UNKNOWN_DATA_TYPE
27+
show create table mysql.mysql_json_test;
28+
--error ER_UNKNOWN_DATA_TYPE
29+
show create table test.mysql_json_test;
30+
31+
SET @old_general_log= @@global.general_log;
32+
SET @old_log_output= @@global.log_output;
33+
SET @@global.general_log = ON;
34+
SET @@global.log_output = "TABLE";
35+
--exec $MYSQL_UPGRADE -s --force 2>&1
36+
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
37+
SET @@global.general_log = @old_general_log;
38+
SET @@global.log_output = @old_log_output;
39+
40+
select command_type, argument from mysql.general_log where argument like "%SELECT table_comment FROM information_schema.tables%";
41+
42+
# User table is not upgraded in `mysql\test` DB, so we cannot see it.
43+
--error ER_UNKNOWN_DATA_TYPE
44+
show create table mysql.mysql_json_test;
45+
--error ER_UNKNOWN_DATA_TYPE
46+
show create table test.mysql_json_test;
47+
drop table mysql.mysql_json_test;
48+
drop table test.mysql_json_test;
49+
50+
--echo #
51+
--echo # End of 10.5 tests
52+
--echo #

‎mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result renamed to ‎mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.result

File renamed without changes.

‎mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.test renamed to ‎mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.test

File renamed without changes.

‎mysql-test/suite/galera/disabled.def

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ galera_as_slave_ctas : MDEV-28378 timeout
1414
galera_pc_recovery : MDEV-25199 cluster fails to start up
1515
galera_sst_encrypted : MDEV-29876 Galera test failure on galera_sst_encrypted
1616
galera_var_node_address : MDEV-20485 Galera test failure
17-
versioning_trx_id : MDEV-18590: galera.versioning_trx_id: Test failure: mysqltest: Result content mismatch
18-
galera_sequences : MDEV-32024
17+
galera_sequences : MDEV-32561 WSREP FSM failure: no such a transition REPLICATING -> COMMITTED
18+
galera_shutdown_nonprim : MDEV-32635 galera_shutdown_nonprim: mysql_shutdown failed
19+
versioning_trx_id : MDEV-18590 : galera.versioning_trx_id: Test failure: mysqltest: Result content mismatch
20+
galera_concurrent_ctas : MDEV-32779 galera_concurrent_ctas: assertion in the galera::ReplicatorSMM::finish_cert()
21+
galera_as_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback()
22+
galera_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback()
23+
galera_bf_lock_wait : MDEV-32781 galera_bf_lock_wait test failed
24+
galera_sst_mysqldump_with_key : MDEV-32782 galera_sst_mysqldump_with_key test failed
1925
mdev-31285 : MDEV-25089 Assertion `error.len > 0' failed in galera::ReplicatorSMM::handle_apply_error()

0 commit comments

Comments
 (0)