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-4851: (tests) log tables modifiable on log_output!=TABLE

Browse Source 
Test we can ALTER log tables directly when not being written
to.

This removes the contraint in the rpl_mysql_upgrade.test such
that we can run mysql_upgrade --write-binlog all the way
through to a replica. We test this in the replication scenario
where the mysql.{slow,general}_log tables aren't being
written to.

Reviewers: Vicențiu Ciorbaru, Anel Husakovic
This commit is contained in:
Daniel Black
2020-10-05 13:26:28 +11:00
parent 00c44fb18e
commit 874942a0f9
4 changed files with 101 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/log_tables.result
View File

@ -377,6 +377,14 @@ slow_log
slow_log_new slow_log_new
drop table slow_log_new, general_log_new; drop table slow_log_new, general_log_new;
use test; use test;
SET GLOBAL LOG_OUTPUT = 'FILE';
SET GLOBAL slow_query_log = 1;
SET GLOBAL general_log = 1;
ALTER TABLE mysql.slow_log ADD COLUMN comment_text TEXT NOT NULL;
ALTER TABLE mysql.general_log ADD COLUMN comment_text TEXT NOT NULL;
SET GLOBAL LOG_OUTPUT = 'NONE';
ALTER TABLE mysql.slow_log DROP COLUMN comment_text;
ALTER TABLE mysql.general_log DROP COLUMN comment_text;
SET GLOBAL LOG_OUTPUT = 'TABLE'; SET GLOBAL LOG_OUTPUT = 'TABLE';
SET GLOBAL general_log = 0; SET GLOBAL general_log = 0;
FLUSH LOGS; FLUSH LOGS;

54
mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
View File

@ -2,12 +2,54 @@ include/master-slave.inc
[connection master] [connection master]
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
call mtr.add_suppression("table or database name 'mysqltest-1'"); call mtr.add_suppression("table or database name 'mysqltest-1'");
DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`; CREATE DATABASE `mysqltest-1`;
CREATE DATABASE `#mysql50#mysqltest-1`;
Master position is not changed Master position is not changed
STOP SLAVE SQL_THREAD; SET @old_general_log_state = @@global.general_log;
include/wait_for_slave_sql_to_stop.inc SET @old_slow_log_state = @@global.slow_query_log;
Master position has been changed SET @old_log_output = @@global.log_output;
SET GLOBAL general_log = 'ON';
SET GLOBAL slow_query_log = 'ON';
SET GLOBAL log_output = 'FILE';
ALTER TABLE mysql.slow_log DROP COLUMN thread_id, DROP COLUMN rows_affected;
DROP DATABASE `mysqltest-1`; DROP DATABASE `mysqltest-1`;
DROP DATABASE `#mysql50#mysqltest-1`; SHOW CREATE TABLE mysql.slow_log;
Table Create Table
slow_log CREATE TABLE `slow_log` (
`start_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
`user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL,
`db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
Master position has been changed
SHOW CREATE TABLE mysql.slow_log;
Table Create Table
slow_log CREATE TABLE `slow_log` (
`start_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
`user_host` mediumtext NOT NULL,
`query_time` time(6) NOT NULL,
`lock_time` time(6) NOT NULL,
`rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL,
`db` varchar(512) NOT NULL,
`last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL,
`rows_affected` int(11) NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
SET GLOBAL general_log = 'OFF';
SET GLOBAL slow_query_log = 'OFF';
truncate mysql.slow_log;
truncate mysql.general_log;
SET GLOBAL general_log = @old_general_log_state;
SET GLOBAL slow_query_log = @old_slow_log_state;
SET GLOBAL log_output = @old_log_output;
include/rpl_end.inc include/rpl_end.inc

34
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
View File

@ -14,8 +14,7 @@ call mtr.add_suppression("table or database name 'mysqltest-1'");
connection master; connection master;
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`; CREATE DATABASE `mysqltest-1`;
CREATE DATABASE `#mysql50#mysqltest-1`;
--enable_warnings --enable_warnings
sync_slave_with_master; sync_slave_with_master;
@ -34,13 +33,25 @@ if ($before_position == $after_position)
echo Master position is not changed; echo Master position is not changed;
} }
#Some log events of the mysql_upgrade's will cause errors on slave. # Some log events of the mysql_upgrade previously caused errors on slave,
# however with MDEV-4851 this should be ok, so we test it:
connection slave; connection slave;
STOP SLAVE SQL_THREAD; SET @old_general_log_state = @@global.general_log;
source include/wait_for_slave_sql_to_stop.inc; SET @old_slow_log_state = @@global.slow_query_log;
SET @old_log_output = @@global.log_output;
SET GLOBAL general_log = 'ON';
SET GLOBAL slow_query_log = 'ON';
SET GLOBAL log_output = 'FILE';
connection master; connection master;
#With '--force' option, mysql_upgrade always executes all sql statements for upgrading. #With '--force' option, mysql_upgrade always executes all sql statements for upgrading.
ALTER TABLE mysql.slow_log DROP COLUMN thread_id, DROP COLUMN rows_affected;
DROP DATABASE `mysqltest-1`;
sync_slave_with_master;
connection slave;
SHOW CREATE TABLE mysql.slow_log;
connection master;
--exec $MYSQL_UPGRADE --skip-verbose --write-binlog --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1 --exec $MYSQL_UPGRADE --skip-verbose --write-binlog --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1
let $datadir= `select @@datadir`; let $datadir= `select @@datadir`;
@ -55,8 +66,15 @@ if ($before_position != $after_position)
echo Master position has been changed; echo Master position has been changed;
} }
DROP DATABASE `mysqltest-1`; sync_slave_with_master;
connection slave; connection slave;
DROP DATABASE `#mysql50#mysqltest-1`; SHOW CREATE TABLE mysql.slow_log;
--let $rpl_only_running_threads= 1 SET GLOBAL general_log = 'OFF';
SET GLOBAL slow_query_log = 'OFF';
truncate mysql.slow_log;
truncate mysql.general_log;
SET GLOBAL general_log = @old_general_log_state;
SET GLOBAL slow_query_log = @old_slow_log_state;
SET GLOBAL log_output = @old_log_output;
--source include/rpl_end.inc --source include/rpl_end.inc

20
mysql-test/t/log_tables.test
View File

@ -58,7 +58,7 @@ select * from general_log where argument like '%general_log%';
# #
# Check some basic queries interfering with the log tables. # Check some basic queries interfering with the log tables.
# In our test we'll use a tbale with verbose comments to the short # In our test we'll use a table with verbose comments to the short
# command type names, used in the tables # command type names, used in the tables
# #
@ -470,6 +470,24 @@ show tables like "%log%";
drop table slow_log_new, general_log_new; drop table slow_log_new, general_log_new;
use test; use test;
#
# Bug#69953 / MDEV-4851
# Log tables should be modifable on LOG_OUTPUT != TABLE
#
#
SET GLOBAL LOG_OUTPUT = 'FILE';
SET GLOBAL slow_query_log = 1;
SET GLOBAL general_log = 1;
ALTER TABLE mysql.slow_log ADD COLUMN comment_text TEXT NOT NULL;
ALTER TABLE mysql.general_log ADD COLUMN comment_text TEXT NOT NULL;
SET GLOBAL LOG_OUTPUT = 'NONE';
ALTER TABLE mysql.slow_log DROP COLUMN comment_text;
ALTER TABLE mysql.general_log DROP COLUMN comment_text;
# #
# Bug#27857 (Log tables supplies the wrong value for generating # Bug#27857 (Log tables supplies the wrong value for generating
# AUTO_INCREMENT numbers) # AUTO_INCREMENT numbers)