diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-29 11:32:09 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-29 11:32:09 +0200 |
| commit | ea4c934a409399e13ac46ac35663011217dcedf6 (patch) | |
| tree | 347dcd807da3d2462141ec4e2106e575667166b2 /mysql-test/r/sp_notembedded.result | |
| parent | 60928825f50572c618f6c3b44cff55185de635da (diff) | |
| parent | 59601768338b0ef997be3bb06278f34b1c577415 (diff) | |
| download | mariadb-git-ea4c934a409399e13ac46ac35663011217dcedf6.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands
into shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools
client/Makefile.am:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/sp_notembedded.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/r/mysqltest.result:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
Diffstat (limited to 'mysql-test/r/sp_notembedded.result')
| -rw-r--r-- | mysql-test/r/sp_notembedded.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index 564b8031c35..0b1fa565d28 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -74,8 +74,7 @@ flush status| flush query cache| delete from t1| drop procedure bug3583| -drop table t1; -#| +drop table t1| drop procedure if exists bug6807| create procedure bug6807() begin |