diff options
author | unknown <msvensson@pilot.(none)> | 2007-08-03 12:57:09 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.(none)> | 2007-08-03 12:57:09 +0200 |
commit | 02d18d3cf92741a26c5d2f981b5faa1a4245a4e3 (patch) | |
tree | 0dd6c72cf37242651f32e95c7053f05d3f20eb55 /mysql-test/r/sp.result | |
parent | 0716ccab81fc85fc9dffbbe57f4f513b1c53b610 (diff) | |
parent | 8b265ffcc1222be7b19c1f1ca908acca847f8a6b (diff) | |
download | mariadb-git-02d18d3cf92741a26c5d2f981b5faa1a4245a4e3.tar.gz |
Merge 192.168.0.7:mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
Diffstat (limited to 'mysql-test/r/sp.result')
-rw-r--r-- | mysql-test/r/sp.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 4a278cd4aec..2cfbe7aadcb 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -5748,6 +5748,7 @@ bug23760_rc_test(ROW_COUNT()) DROP TABLE bug23760, bug23760_log| DROP PROCEDURE bug23760_update_log| DROP PROCEDURE bug23760_test_row_count| +DROP PROCEDURE bug23760_test_row_count2| DROP FUNCTION bug23760_rc_test| DROP PROCEDURE IF EXISTS bug24117| DROP TABLE IF EXISTS t3| |