Commit af12ff65 authored by unknown's avatar unknown
Browse files

Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146... 

  Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
  Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
  limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
  Reason I don't propagate caller info to the binlog as planned is that on master and slave
  users may be different; even with that some caveats would remain.


mysql-test/mysql-test-run.sh:
  In the testsuite we know what we do, we are not creating nasty routines, and breaking binlog is ok except in rpl_sp.
mysql-test/r/blackhole.result:
  Updating results now that 4.1 has been merged
mysql-test/valgrind.supp:
      Some suppressions for Valgrind (useful on my machine Suse 9.1);
      this is just adding to the already existing suppressions of pthread and dl.
sql/item_func.cc:
      Don't binlog the substatements when executing a function. If the function
      is declared to modify data and does not complete, warning "broken binlog".
      Note that SELECT myfunc() will not be binlogged even if myfunc() updates data (will be documented);
      but INSERT INTO t VALUES(myfunc()) will be binlogged (what decides is if the caller
      gets binlogged; the function changes nothing to binlogging).
sql/log_event.cc:
      Just making functions which can be re-used when we binlog more strings
      in status_vars in Query_log_event (e.g. one day "user", "host").
sql/log_event.h:
  comment
sql/mysql_priv.h:
      --log-bin-trust-routine-creators
sql/mysqld.cc:
      --log-bin-trust-routine-creators
sql/set_var.cc:
      --log-bin-trust-routine-creators
sql/share/errmsg.txt:
  error messages to warn about problems with routines and binlog
sql/slave.cc:
      If in a routine, replication table inclusion/exclusion rules always answer "replicate!" (see comment in code).
sql/sp.cc:
      If binlog is on: errors if one wants to create a non-deterministic update routine
      (repeatability problem - note that the test is not perfect for functions) or does not have SUPER (because routines can easily
      be made to destroy slave's data with just CREATE ROUTINE and EXECUTE priv on master).
      --log-bin-trust-routine-creators removes these errors.
      Binlogging of CREATE PROCEDURE|FUNCTION.
sql/sql_acl.cc:
      No thd==0 in tables_ok().
sql/sql_parse.cc:
      Binlogging of CALL (and not of the substatements of the SP).
      If SP returns error, we don't binlog it (see comment); we push warning in this case.
      Binlogging of ALTER|DROP PROCEDURE|FUNCTION with safety messages.
parent 2275c048

mysql-test/mysql-test-run.sh

+3 −0
Original line number Diff line number Diff line
@@ -1187,6 +1187,7 @@ start_master() 
          --language=$LANGUAGE \

          --innodb_data_file_path=ibdata1:128M:autoextend \

	  --open-files-limit=1024 \

          --log-bin-trust-routine-creators \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \
@@ -1207,6 +1208,7 @@ start_master() 
          --tmpdir=$MYSQL_TMP_DIR \

          --language=$LANGUAGE \

          --innodb_data_file_path=ibdata1:128M:autoextend \

          --log-bin-trust-routine-creators \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \
@@ -1339,6 +1341,7 @@ start_slave() 
          --report-port=$slave_port \

          --master-retry-count=10 \

          -O slave_net_timeout=10 \

          --log-bin-trust-routine-creators \

           $SMALL_SERVER \

           $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"

  CUR_MYERR=$slave_err

mysql-test/r/blackhole.result

+4 −4
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ a 
select * from t3;

a

show binlog events;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	#	Start	1	#	Server ver: VERSION, Binlog ver: 3

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4

master-bin.000001	#	Query	1	#	use `test`; drop table t1,t2

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=blackhole

master-bin.000001	#	Query	1	#	use `test`; delete from t1 where a=10
@@ -115,8 +115,8 @@ master-bin.000001 # Query 1 # use `test`; insert into t1 values(1) 
master-bin.000001	#	Query	1	#	use `test`; insert ignore into t1 values(1)

master-bin.000001	#	Query	1	#	use `test`; replace into t1 values(100)

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole

master-bin.000001	#	Create_file	1	#	db=test;table=t2;file_id=1;block_len=581

master-bin.000001	#	Exec_load	1	#	;file_id=1

master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581

master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../../std_data/words.dat' into table t2 ;file_id=1

master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int

master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b

master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1

mysql-test/r/rpl_sp.result

0 → 100644
+235 −0
Original line number Diff line number Diff line 
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;

create database if not exists mysqltest1;

use mysqltest1;

create table t1 (a varchar(100));

use mysqltest1;

drop procedure if exists foo;

drop procedure if exists foo2;

drop procedure if exists foo3;

drop procedure if exists foo4;

drop procedure if exists bar;

drop function if exists fn1;

create procedure foo()

begin

declare b int;

set b = 8;

insert into t1 values (b);

insert into t1 values (unix_timestamp());

end|

ERROR HY000: This routine is declared to be non-deterministic and to modify data and binary logging is enabled (you *might* want to use the less safe log_bin_trust_routine_creators variable)

show binlog events from 98|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	create database if not exists mysqltest1

master-bin.000001	#	Query	1	#	use `mysqltest1`; create table t1 (a varchar(100))

create procedure foo() deterministic

begin

declare b int;

set b = 8;

insert into t1 values (b);

insert into t1 values (unix_timestamp());

end|

select * from mysql.proc where name='foo' and db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

mysqltest1	foo	PROCEDURE	foo	SQL	CONTAINS_SQL	YES	DEFINER			begin

declare b int;

set b = 8;

insert into t1 values (b);

insert into t1 values (unix_timestamp());

end	root@localhost	#	#		

select * from mysql.proc where name='foo' and db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

mysqltest1	foo	PROCEDURE	foo	SQL	CONTAINS_SQL	YES	DEFINER			begin

declare b int;

set b = 8;

insert into t1 values (b);

insert into t1 values (unix_timestamp());

end	@	#	#		

set timestamp=1000000000;

call foo();

show binlog events from 308;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo() deterministic

begin

declare b int;

set b = 8;

insert into t1 values (b);

insert into t1 values (unix_timestamp());

end

master-bin.000001	#	Query	1	#	use `mysqltest1`; call foo()

select * from t1;

a

8

1000000000

select * from t1;

a

8

1000000000

delete from t1;

create procedure foo2()

not deterministic

reads sql data

select * from mysqltest1.t1;

call foo2();

a

show binlog events from 605;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `mysqltest1`; delete from t1

master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo2()

not deterministic

reads sql data

select * from mysqltest1.t1

alter procedure foo2 contains sql;

ERROR HY000: This routine is declared to be non-deterministic and to modify data and binary logging is enabled (you *might* want to use the less safe log_bin_trust_routine_creators variable)

drop table t1;

create table t1 (a int);

create table t2 like t1;

create procedure foo3()

deterministic

insert into t1 values (15);

grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1;

grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1;

grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1;

create procedure foo4()

deterministic

insert into t1 values (10);

ERROR HY000: You do not have SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_routine_creators variable)

set global log_bin_trust_routine_creators=1;

create procedure foo4()

deterministic

begin

insert into t2 values(3);

insert into t1 values (5);

end|

call foo4();

ERROR 42000: INSERT command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'

show warnings;

Level	Code	Message

Warning	1417	A routine failed and is declared to modify data and binary logging is enabled; if non-transactional tables were updated, the binary log will miss their changes

call foo3();

show warnings;

Level	Code	Message

call foo4();

ERROR 42000: INSERT command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'

show warnings;

Level	Code	Message

Warning	1417	A routine failed and is declared to modify data and binary logging is enabled; if non-transactional tables were updated, the binary log will miss their changes

alter procedure foo4 sql security invoker;

call foo4();

show warnings;

Level	Code	Message

show binlog events from 841;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `mysqltest1`; drop table t1

master-bin.000001	#	Query	1	#	use `mysqltest1`; create table t1 (a int)

master-bin.000001	#	Query	1	#	use `mysqltest1`; create table t2 like t1

master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo3()

deterministic

insert into t1 values (15)

master-bin.000001	#	Query	1	#	use `mysqltest1`; grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1

master-bin.000001	#	Query	1	#	use `mysqltest1`; grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1

master-bin.000001	#	Query	1	#	use `mysqltest1`; grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1

master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo4()

deterministic

begin

insert into t2 values(3);

insert into t1 values (5);

end

master-bin.000001	#	Query	1	#	use `mysqltest1`; call foo3()

master-bin.000001	#	Query	1	#	use `mysqltest1`; alter procedure foo4 sql security invoker

master-bin.000001	#	Query	1	#	use `mysqltest1`; call foo4()

select * from t1;

a

15

5

select * from t2;

a

3

3

3

select * from t1;

a

15

5

select * from t2;

a

3

select if(compte<>3,"this is broken but documented","this unexpectedly works?") from (select count(*) as compte from t2) as aggreg;

if(compte<>3,"this is broken but documented","this unexpectedly works?")

this is broken but documented

select * from mysql.proc where name="foo4" and db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

mysqltest1	foo4	PROCEDURE	foo4	SQL	CONTAINS_SQL	YES	INVOKER			begin

insert into t2 values(3);

insert into t1 values (5);

end	@	#	#		

drop procedure foo4;

select * from mysql.proc where name="foo4" and db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

select * from mysql.proc where name="foo4" and db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

drop procedure foo;

drop procedure foo2;

drop procedure foo3;

create function fn1(x int)

returns int

deterministic

begin

insert into t1 values (x);

return x+2;

end|

delete t1,t2 from t1,t2;

select fn1(20);

fn1(20)

22

insert into t2 values(fn1(21));

select * from t1;

a

21

20

select * from t2;

a

23

select * from t1;

a

21

select if(compte<>1,"this is broken but documented","this unexpectedly works?") from (select count(*) as compte from t1 where a=20) as aggreg;

if(compte<>1,"this is broken but documented","this unexpectedly works?")

this is broken but documented

select * from t2;

a

23

drop function fn1;

create function fn1()

returns int

deterministic

begin

return unix_timestamp();

end|

delete from t1;

set timestamp=1000000000;

insert into t1 values(fn1());

select * from mysql.proc where db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

mysqltest1	fn1	FUNCTION	fn1	SQL	CONTAINS_SQL	YES	DEFINER		int(11)	begin

return unix_timestamp();

end	root@localhost	#	#		

select * from t1;

a

1000000000

use mysqltest1;

select * from t1;

a

1000000000

select * from mysql.proc where db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

mysqltest1	fn1	FUNCTION	fn1	SQL	CONTAINS_SQL	YES	DEFINER		int(11)	begin

return unix_timestamp();

end	@	#	#		

drop function fn1;

drop database mysqltest1;

drop user "zedjzlcsjhd"@127.0.0.1;

mysql-test/t/rpl_sp-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--log_bin_trust_routine_creators=0

mysql-test/t/rpl_sp-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--log_bin_trust_routine_creators=0