diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-07 17:57:26 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-07 17:57:26 +0100 |
| commit | 0522905ac3270e5ddcef79e96169d1d972d1fc13 (patch) | |
| tree | 4a5ae6ef2c5f066164a167c072e40d4b207f10da /mysql-test/r/ps_1general.result | |
| parent | 59bd66d36905e21db4c3080d359452aaefa97279 (diff) | |
| parent | 3b8004329627ea643f9c59c9ee683b38dd976d4f (diff) | |
| download | mariadb-git-0522905ac3270e5ddcef79e96169d1d972d1fc13.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/trigger-compat.result:
Merge 5.0 -> 5.1
Diffstat (limited to 'mysql-test/r/ps_1general.result')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index cf858cc1d32..859050fd4a3 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -785,4 +785,4 @@ prepare stmt1 from @string ; execute stmt1 ; prepare stmt1 from ' select * from t5 ' ; execute stmt1 ; -drop table t5, t9; +drop table t1, t5, t9; |