diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-15 10:31:23 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-15 10:31:23 +0100 |
| commit | 4e0cace23d0f0dd61c288dbeb6447d80b025a924 (patch) | |
| tree | 3cf80a037e826309a697cf8b347a929f0d8290bf /mysql-test/r/rpl_sp.result | |
| parent | 37b4ad8cca9c095507affbf024f2dd254371fcf1 (diff) | |
| parent | 8b8647ff42757f0908340b054ec3d74c56ebfcb0 (diff) | |
| download | mariadb-git-4e0cace23d0f0dd61c288dbeb6447d80b025a924.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/extra/rpl_tests/rpl_deadlock.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
Auto merged
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
Auto merged
mysql-test/r/rpl_timezone.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/mysqldump.result:
Manual merge
mysql-test/r/rpl_drop_db.result:
Manual merge
mysql-test/r/rpl_variables.result:
Manual merge
mysql-test/t/rpl_drop_db.test:
Manual merge
mysql-test/t/rpl_sp.test:
Manual merge
mysql-test/t/rpl_timezone.test:
Manual merge
mysql-test/t/rpl_variables.test:
Manual merge
Diffstat (limited to 'mysql-test/r/rpl_sp.result')
| -rw-r--r-- | mysql-test/r/rpl_sp.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_sp.result b/mysql-test/r/rpl_sp.result index 261e7cb072c..87af3cc622b 100644 --- a/mysql-test/r/rpl_sp.result +++ b/mysql-test/r/rpl_sp.result @@ -465,3 +465,5 @@ RETURN 0 DROP PROCEDURE p1; DROP FUNCTION f1; drop table t1; +set global log_bin_trust_function_creators=0; +set global log_bin_trust_function_creators=0; |