mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
8272be9412
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege include/mysql.h: Make server_inited external libmysqld/libmysqld.c: Remove reference to (wrong) external variable mysql-test/r/grant.result: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/r/mix_innodb_myisam_binlog.result: Change to use tables t1 and t2 mysql-test/t/grant.test: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/t/mix_innodb_myisam_binlog.test: Change to use tables t1 and t2 sql/sql_acl.cc: Fix bug in SHOW GRANTS when there is a column privilege but no table privilege sql/sql_parse.cc: Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
180 lines
5.9 KiB
Text
180 lines
5.9 KiB
Text
drop table if exists t1, t2;
|
|
create table t1 (a int) type=innodb;
|
|
create table t2 (a int) type=myisam;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(1);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(1)
|
|
master-bin.001 178 Query 1 79 use test; insert into t2 select * from t1
|
|
master-bin.001 244 Query 1 244 use test; COMMIT
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(2);
|
|
insert into t2 select * from t1;
|
|
rollback;
|
|
Warning: Some non-transactional changed tables couldn't be rolled back
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(2)
|
|
master-bin.001 178 Query 1 79 use test; insert into t2 select * from t1
|
|
master-bin.001 244 Query 1 244 use test; ROLLBACK
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(3);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(4);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
Warning: Some non-transactional changed tables couldn't be rolled back
|
|
commit;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(3)
|
|
master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
|
|
master-bin.001 235 Query 1 79 use test; insert into t1 values(4)
|
|
master-bin.001 294 Query 1 79 use test; insert into t2 select * from t1
|
|
master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
|
|
master-bin.001 429 Query 1 429 use test; COMMIT
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(5);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(6);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
Warning: Some non-transactional changed tables couldn't be rolled back
|
|
insert into t1 values(7);
|
|
commit;
|
|
select a from t1 order by a;
|
|
a
|
|
5
|
|
7
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(5)
|
|
master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
|
|
master-bin.001 235 Query 1 79 use test; insert into t1 values(6)
|
|
master-bin.001 294 Query 1 79 use test; insert into t2 select * from t1
|
|
master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
|
|
master-bin.001 429 Query 1 79 use test; insert into t1 values(7)
|
|
master-bin.001 488 Query 1 488 use test; COMMIT
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
select get_lock("a",10);
|
|
get_lock("a",10)
|
|
1
|
|
begin;
|
|
insert into t1 values(8);
|
|
insert into t2 select * from t1;
|
|
select get_lock("a",10);
|
|
get_lock("a",10)
|
|
1
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(8)
|
|
master-bin.001 178 Query 1 79 use test; insert into t2 select * from t1
|
|
master-bin.001 244 Query 1 244 use test; ROLLBACK
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
insert into t1 values(9);
|
|
insert into t2 select * from t1;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; insert into t1 values(9)
|
|
master-bin.001 138 Query 1 138 use test; insert into t2 select * from t1
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
insert into t1 values(10);
|
|
begin;
|
|
insert into t2 select * from t1;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; insert into t1 values(10)
|
|
master-bin.001 139 Query 1 139 use test; insert into t2 select * from t1
|
|
insert into t1 values(11);
|
|
commit;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; insert into t1 values(10)
|
|
master-bin.001 139 Query 1 139 use test; insert into t2 select * from t1
|
|
master-bin.001 205 Query 1 205 use test; BEGIN
|
|
master-bin.001 245 Query 1 205 use test; insert into t1 values(11)
|
|
master-bin.001 305 Query 1 305 use test; COMMIT
|
|
alter table t2 type=INNODB;
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(12);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(12)
|
|
master-bin.001 179 Query 1 79 use test; insert into t2 select * from t1
|
|
master-bin.001 245 Query 1 245 use test; COMMIT
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(13);
|
|
insert into t2 select * from t1;
|
|
rollback;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(14);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(15);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
commit;
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(14)
|
|
master-bin.001 179 Query 1 179 use test; COMMIT
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(16);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(17);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
insert into t1 values(18);
|
|
commit;
|
|
select a from t1 order by a;
|
|
a
|
|
16
|
|
18
|
|
show binlog events from 79;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.001 79 Query 1 79 use test; BEGIN
|
|
master-bin.001 119 Query 1 79 use test; insert into t1 values(16)
|
|
master-bin.001 179 Query 1 79 use test; insert into t1 values(18)
|
|
master-bin.001 239 Query 1 239 use test; COMMIT
|
|
drop table t1,t2;
|