mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
ca59e88ce3
Problem: Many test cases don't clean up after themselves (fail to drop tables or fail to reset variables). This implies that: (1) check-testcase in the new mtr that currently lives in 5.1-rpl failed. (2) it may cause unexpected results in subsequent tests. Fix: make all tests clean up. Also: cleaned away unnecessary output in rpl_packet.result Also: fixed bug where rpl_log called RESET MASTER with a running slave. This is not supposed to work. Also: removed unnecessary code from rpl_stm_EE_err2 and made it verify that an error occurred. Also: removed unnecessary code from rpl_ndb_ctype_ucs2_def. mysql-test/extra/rpl_tests/rpl_loaddata.test: Made test clean up after itself. mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test: Made test clean up after itself. Also removed unnecessary save_master_pos. Also made test verify that an error occurred. mysql-test/extra/rpl_tests/rpl_truncate_helper.test: Made test clean up after itself. mysql-test/include/query_cache.inc: Made test clean up after itself. mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test: Made test clean up after itself. mysql-test/suite/rpl/t/rpl_alter_db.test: Made test clean up after itself. Easiest to refactor the test a little, to use an auxiliary database instead of mysql: Then we don't need to read the collation at the start of the test and reset it at the end of the test. We can just drop the database. mysql-test/suite/rpl/t/rpl_drop_db.test: Made test clean up after itself. mysql-test/suite/rpl/t/rpl_drop_view.test: Made test clean up after itself. mysql-test/suite/rpl/t/rpl_events.test: Made test clean up after itself. mysql-test/suite/rpl/t/rpl_idempotency.test: Made test clean up after itself. mysql-test/suite/rpl/t/rpl_ignore_table.test: Made test clean up after itself. The existing cleanup code didn't work, because the --replicate-* options prevented the "drop table" from being replicated. Moved "drop table t4" to a statement of its own. mysql-test/suite/rpl/t/rpl_packet.test: Made test clean up after itself. Also replaced SHOW SLAVE STATUS by query_get_value(SHOW SLAVE STATUS...), since only one column of the result was interesting. mysql-test/suite/rpl/t/rpl_row_max_relay_size.test: Made test clean up after itself. Instead of setting binlog format at the beginning of the test, we just do 'source include/have_binlog_format_row.inc' like all other tests. mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test: Made test clean up after itself. mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test: Made test clean up after itself. Also removed unnecessary 'create table; drop table' Also removed unnecessary use of --command mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test: Made test clean up after itself. mysql-test/t/innodb-autoinc-optimize.test: Made test clean up after itself. mysql-test/t/innodb.test: Made test clean up after itself. mysql-test/t/log_tables.test: Made test clean up after itself. mysql-test/t/mysql_client_test.test: Made test clean up after itself. mysql-test/t/partition.test: Made test clean up after itself. mysql-test/t/status.test: Made test clean up after itself.
143 lines
6.1 KiB
Text
143 lines
6.1 KiB
Text
stop slave;
|
||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||
reset master;
|
||
reset slave;
|
||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||
start slave;
|
||
**** Test case for BUG#16487 ****
|
||
**** Master ****
|
||
CREATE TABLE test.t4 (a int);
|
||
CREATE TABLE test.t1 (a int);
|
||
UPDATE test.t4 NATURAL JOIN test.t1 SET t1.a=5;
|
||
**** Slave ****
|
||
SELECT * FROM t4;
|
||
a
|
||
DROP TABLE t1;
|
||
DROP TABLE t4;
|
||
**** Test case for BUG#25482 ****
|
||
**** Adding GRANTS on master ****
|
||
create table test.t1(a int);
|
||
create table test.t4(a int);
|
||
GRANT SELECT ON test.t1 TO mysqltest1@localhost;
|
||
GRANT INSERT ON test.t4 TO mysqltest2@localhost;
|
||
GRANT select, update, insert, references on t1
|
||
to mysqltest2@localhost;
|
||
GRANT SELECT ON test.* TO mysqltest3@localhost;
|
||
GRANT INSERT ON test.t4 TO mysqltest3@localhost;
|
||
GRANT select(a), update(a), insert(a), references(a) on t4
|
||
to mysqltest3@localhost;
|
||
create database mysqltest2;
|
||
create table mysqltest2.t2 (id int);
|
||
GRANT SELECT ON mysqltest2.t2 TO mysqltest4@localhost IDENTIFIED BY 'pass';
|
||
insert into mysql.user (user, host) values ("mysqltest5", "somehost");
|
||
Warnings:
|
||
Warning 1364 Field 'ssl_cipher' doesn't have a default value
|
||
Warning 1364 Field 'x509_issuer' doesn't have a default value
|
||
Warning 1364 Field 'x509_subject' doesn't have a default value
|
||
GRANT SELECT ON *.* TO mysqltest6@localhost;
|
||
GRANT INSERT ON *.* TO mysqltest6@localhost;
|
||
GRANT INSERT ON test.* TO mysqltest6@localhost;
|
||
GRANT INSERT ON test.t1 TO mysqltest6@localhost;
|
||
show grants for mysqltest1@localhost;
|
||
Grants for mysqltest1@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest1'@'localhost'
|
||
GRANT SELECT ON `test`.`t1` TO 'mysqltest1'@'localhost'
|
||
show grants for mysqltest2@localhost;
|
||
Grants for mysqltest2@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest2'@'localhost'
|
||
GRANT SELECT, INSERT, UPDATE, REFERENCES ON `test`.`t1` TO 'mysqltest2'@'localhost'
|
||
GRANT INSERT ON `test`.`t4` TO 'mysqltest2'@'localhost'
|
||
show grants for mysqltest3@localhost;
|
||
Grants for mysqltest3@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest3'@'localhost'
|
||
GRANT SELECT ON `test`.* TO 'mysqltest3'@'localhost'
|
||
GRANT SELECT (a), INSERT, INSERT (a), UPDATE (a), REFERENCES (a) ON `test`.`t4` TO 'mysqltest3'@'localhost'
|
||
show grants for mysqltest4@localhost;
|
||
Grants for mysqltest4@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest4'@'localhost' IDENTIFIED BY PASSWORD '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7'
|
||
GRANT SELECT ON `mysqltest2`.`t2` TO 'mysqltest4'@'localhost'
|
||
show grants for mysqltest6@localhost;
|
||
Grants for mysqltest6@localhost
|
||
GRANT SELECT, INSERT ON *.* TO 'mysqltest6'@'localhost'
|
||
GRANT INSERT ON `test`.* TO 'mysqltest6'@'localhost'
|
||
GRANT INSERT ON `test`.`t1` TO 'mysqltest6'@'localhost'
|
||
flush privileges;
|
||
show grants for mysqltest5@somehost;
|
||
Grants for mysqltest5@somehost
|
||
GRANT USAGE ON *.* TO 'mysqltest5'@'somehost'
|
||
**** Checking grants on slave ****
|
||
show grants for mysqltest2@localhost;
|
||
Grants for mysqltest2@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest2'@'localhost'
|
||
GRANT INSERT ON `test`.`t4` TO 'mysqltest2'@'localhost'
|
||
show grants for mysqltest3@localhost;
|
||
Grants for mysqltest3@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest3'@'localhost'
|
||
GRANT SELECT ON `test`.* TO 'mysqltest3'@'localhost'
|
||
GRANT SELECT (a), INSERT, INSERT (a), UPDATE (a), REFERENCES (a) ON `test`.`t4` TO 'mysqltest3'@'localhost'
|
||
show grants for mysqltest4@localhost;
|
||
Grants for mysqltest4@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest4'@'localhost' IDENTIFIED BY PASSWORD '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7'
|
||
GRANT SELECT ON `mysqltest2`.`t2` TO 'mysqltest4'@'localhost'
|
||
show grants for mysqltest5@somehost;
|
||
Grants for mysqltest5@somehost
|
||
GRANT USAGE ON *.* TO 'mysqltest5'@'somehost'
|
||
show grants for mysqltest6@localhost;
|
||
Grants for mysqltest6@localhost
|
||
GRANT SELECT, INSERT ON *.* TO 'mysqltest6'@'localhost'
|
||
GRANT INSERT ON `test`.* TO 'mysqltest6'@'localhost'
|
||
show grants for mysqltest1@localhost;
|
||
ERROR 42000: There is no such grant defined for user 'mysqltest1' on host 'localhost'
|
||
**** Revoking grants on master ****
|
||
REVOKE SELECT ON test.t1 FROM mysqltest1@localhost;
|
||
REVOKE SELECT ON mysqltest2.t2 FROM mysqltest4@localhost;
|
||
REVOKE select(a) on t4
|
||
from mysqltest3@localhost;
|
||
show grants for mysqltest1@localhost;
|
||
Grants for mysqltest1@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest1'@'localhost'
|
||
show grants for mysqltest3@localhost;
|
||
Grants for mysqltest3@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest3'@'localhost'
|
||
GRANT SELECT ON `test`.* TO 'mysqltest3'@'localhost'
|
||
GRANT INSERT, INSERT (a), UPDATE (a), REFERENCES (a) ON `test`.`t4` TO 'mysqltest3'@'localhost'
|
||
show grants for mysqltest4@localhost;
|
||
Grants for mysqltest4@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest4'@'localhost' IDENTIFIED BY PASSWORD '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7'
|
||
**** Checking grants on slave ****
|
||
show grants for mysqltest1@localhost;
|
||
ERROR 42000: There is no such grant defined for user 'mysqltest1' on host 'localhost'
|
||
show grants for mysqltest3@localhost;
|
||
Grants for mysqltest3@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest3'@'localhost'
|
||
GRANT SELECT ON `test`.* TO 'mysqltest3'@'localhost'
|
||
GRANT INSERT, INSERT (a), UPDATE (a), REFERENCES (a) ON `test`.`t4` TO 'mysqltest3'@'localhost'
|
||
show grants for mysqltest4@localhost;
|
||
Grants for mysqltest4@localhost
|
||
GRANT USAGE ON *.* TO 'mysqltest4'@'localhost' IDENTIFIED BY PASSWORD '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7'
|
||
set global slave_exec_mode='IDEMPOTENT';
|
||
drop table t1, mysqltest2.t2;
|
||
drop table t4;
|
||
drop database mysqltest2;
|
||
delete from mysql.user where user like "mysqltest%";
|
||
delete from mysql.db where user like "mysqltest%";
|
||
delete from mysql.columns_priv where user like "mysqltest%";
|
||
delete from mysql.tables_priv where user like "mysqltest%";
|
||
delete from mysql.tables_priv where user like "mysqltest%";
|
||
DROP TABLE IF EXISTS t5;
|
||
CREATE TABLE t5 (
|
||
word varchar(50) collate utf8_unicode_ci NOT NULL default ''
|
||
) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
|
||
SET @@session.character_set_client=33,@@session.collation_connection=192;
|
||
CREATE TEMPORARY TABLE tmptbl504451f4258$1 (id INT NOT NULL) ENGINE=MEMORY;
|
||
INSERT INTO t5 (word) VALUES ('TEST’');
|
||
SELECT HEX(word) FROM t5;
|
||
HEX(word)
|
||
54455354E28099
|
||
set @@global.slave_exec_mode= default;
|
||
SELECT HEX(word) FROM t5;
|
||
HEX(word)
|
||
54455354E28099
|
||
SELECT * FROM tmptbl504451f4258$1;
|
||
ERROR 42S02: Table 'test.tmptbl504451f4258$1' doesn't exist
|
||
DROP TABLE t5;
|