mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge mysql-test/r/sp.result: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/sp.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/rpl_utility.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged
This commit is contained in:
unknown
50
mysql-test/suite/rpl/r/rpl_binlog_grant.result
Normal file
50
mysql-test/suite/rpl/r/rpl_binlog_grant.result
Normal file
@ -0,0 +1,50 @@
|
||||
drop database if exists d1;
|
||||
create database d1;
|
||||
use d1;
|
||||
create table t (s1 int) engine=innodb;
|
||||
set @@autocommit=0;
|
||||
start transaction;
|
||||
insert into t values (1);
|
||||
grant select on t to x@y;
|
||||
rollback;
|
||||
show grants for x@y;
|
||||
Grants for x@y
|
||||
GRANT USAGE ON *.* TO 'x'@'y'
|
||||
GRANT SELECT ON `d1`.`t` TO 'x'@'y'
|
||||
show binlog events;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
master-bin.000001 4 Format_desc 1 106 Server ver: VERSION, Binlog ver: 4
|
||||
master-bin.000001 106 Query 1 193 drop database if exists d1
|
||||
master-bin.000001 193 Query 1 272 create database d1
|
||||
master-bin.000001 272 Query 1 370 use `d1`; create table t (s1 int) engine=innodb
|
||||
master-bin.000001 370 Query 1 436 use `d1`; BEGIN
|
||||
master-bin.000001 436 Query 1 521 use `d1`; insert into t values (1)
|
||||
master-bin.000001 521 Xid 1 548 COMMIT /* xid=12 */
|
||||
master-bin.000001 548 Query 1 633 use `d1`; grant select on t to x@y
|
||||
start transaction;
|
||||
insert into t values (2);
|
||||
revoke select on t from x@y;
|
||||
commit;
|
||||
select * from t;
|
||||
s1
|
||||
1
|
||||
2
|
||||
show grants for x@y;
|
||||
Grants for x@y
|
||||
GRANT USAGE ON *.* TO 'x'@'y'
|
||||
show binlog events;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
master-bin.000001 4 Format_desc 1 106 Server ver: VERSION, Binlog ver: 4
|
||||
master-bin.000001 106 Query 1 193 drop database if exists d1
|
||||
master-bin.000001 193 Query 1 272 create database d1
|
||||
master-bin.000001 272 Query 1 370 use `d1`; create table t (s1 int) engine=innodb
|
||||
master-bin.000001 370 Query 1 436 use `d1`; BEGIN
|
||||
master-bin.000001 436 Query 1 521 use `d1`; insert into t values (1)
|
||||
master-bin.000001 521 Xid 1 548 COMMIT /* xid=12 */
|
||||
master-bin.000001 548 Query 1 633 use `d1`; grant select on t to x@y
|
||||
master-bin.000001 633 Query 1 699 use `d1`; BEGIN
|
||||
master-bin.000001 699 Query 1 784 use `d1`; insert into t values (2)
|
||||
master-bin.000001 784 Xid 1 811 COMMIT /* xid=18 */
|
||||
master-bin.000001 811 Query 1 899 use `d1`; revoke select on t from x@y
|
||||
drop user x@y;
|
||||
drop database d1;
|
||||
@ -26,5 +26,55 @@ from-master-2-'',
|
||||
from-var-from-master-3
|
||||
drop table t1;
|
||||
stop slave;
|
||||
|
||||
########################################################################
|
||||
#
|
||||
# BUG#25843: Changing default database between PREPARE and EXECUTE of
|
||||
# statement breaks binlog.
|
||||
#
|
||||
########################################################################
|
||||
|
||||
# Connection: slave
|
||||
|
||||
|
||||
START SLAVE;
|
||||
|
||||
# Connection: master
|
||||
|
||||
|
||||
CREATE DATABASE mysqltest1;
|
||||
CREATE TABLE t1(db_name CHAR(32), db_col_name CHAR(32));
|
||||
|
||||
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)';
|
||||
|
||||
EXECUTE stmt_d_1;
|
||||
|
||||
use mysqltest1;
|
||||
|
||||
EXECUTE stmt_d_1;
|
||||
|
||||
|
||||
# Connection: slave
|
||||
|
||||
|
||||
SELECT * FROM t1;
|
||||
db_name db_col_name
|
||||
test latin1_swedish_ci
|
||||
test latin1_swedish_ci
|
||||
|
||||
# Connection: master
|
||||
|
||||
|
||||
DROP DATABASE mysqltest1;
|
||||
|
||||
use test;
|
||||
|
||||
|
||||
# Connection: slave
|
||||
|
||||
|
||||
STOP SLAVE;
|
||||
|
||||
########################################################################
|
||||
reset master;
|
||||
reset slave;
|
||||
|
||||
41
mysql-test/suite/rpl/t/rpl_binlog_grant.test
Normal file
41
mysql-test/suite/rpl/t/rpl_binlog_grant.test
Normal file
@ -0,0 +1,41 @@
|
||||
-- source include/have_innodb.inc
|
||||
-- source include/not_embedded.inc
|
||||
-- source include/have_binlog_format_mixed_or_statement.inc
|
||||
|
||||
let $VERSION=`select version()`;
|
||||
|
||||
# Bug #21975: grant/revoke statements in transaction
|
||||
# used to disappear from binlog upon rallback.
|
||||
# Now GRANT/REVOKE do implicitly commit
|
||||
# transaction
|
||||
|
||||
--disable_warnings
|
||||
drop database if exists d1;
|
||||
--enable_warnings
|
||||
create database d1;
|
||||
use d1;
|
||||
create table t (s1 int) engine=innodb;
|
||||
set @@autocommit=0;
|
||||
start transaction;
|
||||
insert into t values (1);
|
||||
grant select on t to x@y;
|
||||
#
|
||||
# There is no active transaction here
|
||||
#
|
||||
rollback;
|
||||
show grants for x@y;
|
||||
--replace_result $VERSION VERSION
|
||||
show binlog events;
|
||||
start transaction;
|
||||
insert into t values (2);
|
||||
revoke select on t from x@y;
|
||||
#
|
||||
# There is no active transaction here
|
||||
#
|
||||
commit;
|
||||
select * from t;
|
||||
show grants for x@y;
|
||||
--replace_result $VERSION VERSION
|
||||
show binlog events;
|
||||
drop user x@y;
|
||||
drop database d1;
|
||||
@ -46,6 +46,101 @@ stop slave;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
||||
#
|
||||
# Bug #25843 Changing default database between PREPARE and EXECUTE of statement
|
||||
# breaks binlog.
|
||||
#
|
||||
# There were actually two problems discovered by this bug:
|
||||
#
|
||||
# 1. Default (current) database is not fixed at the creation time.
|
||||
# That leads to wrong output of DATABASE() function.
|
||||
#
|
||||
# 2. Database attributes (@@collation_database) are not fixed at the creation
|
||||
# time. That leads to wrong resultset.
|
||||
#
|
||||
# Binlog breakage and Query Cache wrong output happened because of the first
|
||||
# problem.
|
||||
#
|
||||
|
||||
--echo
|
||||
--echo ########################################################################
|
||||
--echo #
|
||||
--echo # BUG#25843: Changing default database between PREPARE and EXECUTE of
|
||||
--echo # statement breaks binlog.
|
||||
--echo #
|
||||
--echo ########################################################################
|
||||
|
||||
###############################################################################
|
||||
|
||||
--echo
|
||||
--echo # Connection: slave
|
||||
--echo
|
||||
--connection slave
|
||||
|
||||
--echo
|
||||
START SLAVE;
|
||||
|
||||
--echo
|
||||
--echo # Connection: master
|
||||
--echo
|
||||
--connection master
|
||||
|
||||
--echo
|
||||
CREATE DATABASE mysqltest1;
|
||||
CREATE TABLE t1(db_name CHAR(32), db_col_name CHAR(32));
|
||||
|
||||
--echo
|
||||
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)';
|
||||
|
||||
--echo
|
||||
EXECUTE stmt_d_1;
|
||||
|
||||
--echo
|
||||
use mysqltest1;
|
||||
|
||||
--echo
|
||||
EXECUTE stmt_d_1;
|
||||
|
||||
--echo
|
||||
--save_master_pos
|
||||
|
||||
--echo
|
||||
--echo # Connection: slave
|
||||
--echo
|
||||
--connection slave
|
||||
--sync_with_master
|
||||
|
||||
--echo
|
||||
SELECT * FROM t1;
|
||||
|
||||
--echo
|
||||
--echo # Connection: master
|
||||
--echo
|
||||
--connection master
|
||||
|
||||
--echo
|
||||
DROP DATABASE mysqltest1;
|
||||
|
||||
--echo
|
||||
use test;
|
||||
|
||||
--echo
|
||||
--save_master_pos
|
||||
|
||||
--echo
|
||||
--echo # Connection: slave
|
||||
--echo
|
||||
--connection slave
|
||||
--sync_with_master
|
||||
|
||||
--echo
|
||||
STOP SLAVE;
|
||||
|
||||
--echo
|
||||
--echo ########################################################################
|
||||
|
||||
###############################################################################
|
||||
|
||||
reset master;
|
||||
reset slave;
|
||||
disconnect master;
|
||||
|
||||
Reference in New Issue
Block a user