diff options
| author | guilhem@mysql.com <> | 2005-11-18 16:38:01 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2005-11-18 16:38:01 +0100 |
| commit | 2f95fc2701bd83a9aea31e167f69c16ee51a6317 (patch) | |
| tree | 07e22cfddd8927526e3bb2ef581822106278886f /mysql-test/t/rpl_sp-slave.opt | |
| parent | 50afa94dd509be490ebe274b8feec966864b502b (diff) | |
| parent | 43bbd352e3aa4af23f479e33ba80a6dfdeb6774f (diff) | |
| download | mariadb-git-2f95fc2701bd83a9aea31e167f69c16ee51a6317.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
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 709a224fd92..611ee1f33be 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 +--log_bin_trust_routine_creators=0 --slave-skip-errors=1062 |