diff options
| author | unknown <guilhem@mysql.com> | 2006-02-18 17:26:30 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2006-02-18 17:26:30 +0100 |
| commit | 8470ae9cb1327ee5089b98a148e26bb207662fd7 (patch) | |
| tree | f116e5166e64745d3a2d9e1b36b23de4e8815782 /mysql-test/t/rpl_sp-slave.opt | |
| parent | cefc0b6dffcf3f7cd0e1ee7ebc6dd14eca622757 (diff) | |
| download | mariadb-git-8470ae9cb1327ee5089b98a148e26bb207662fd7.tar.gz | |
Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)":
if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
slave would stop and complain that error code between him and master mismatch.
To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
And: minor wording change in the help text.
This cset will cause conflicts in 5.1, I'll merge.
mysql-test/r/rpl_sp.result:
result update
mysql-test/t/rpl_sp-slave.opt:
bug just fixed so option not needed
mysql-test/t/rpl_sp.test:
test for more half-failed functions with DO and SELECT, to test the bug of this changeset.
cleanup at the end.
sql/mysqld.cc:
function -> stored function (change suggested by Paul)
sql/sp_head.cc:
When a function updates data and is called from a non-binlogged statement (SELECT, DO), we binlog it
as SELECT myfunc(), and not DO myfunc() like before.
Diffstat (limited to 'mysql-test/t/rpl_sp-slave.opt')
| -rw-r--r-- | mysql-test/t/rpl_sp-slave.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_sp-slave.opt b/mysql-test/t/rpl_sp-slave.opt index 611ee1f33be..709a224fd92 100644 --- a/mysql-test/t/rpl_sp-slave.opt +++ b/mysql-test/t/rpl_sp-slave.opt @@ -1 +1 @@ ---log_bin_trust_routine_creators=0 --slave-skip-errors=1062 +--log_bin_trust_routine_creators=0 |