diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-07 16:56:49 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-07 16:56:49 -0400 |
| commit | 9b6a1384114a41beb8b492aed335096ef03c86df (patch) | |
| tree | fb8f1a4bdf4381a60d5f7942b45e9221918be678 /mysql-test/t/ps_1general.test | |
| parent | 8ceaccb3fa194ea2e548bc369aaae0920522a4d8 (diff) | |
| download | mariadb-git-9b6a1384114a41beb8b492aed335096ef03c86df.tar.gz | |
Tweaks for duplicate and missing lines in tests from a huge merge.
mysql-test/r/type_newdecimal.result:
Make test clean up after itself.
mysql-test/t/ps_1general.test:
Remove improperly merged lines.
mysql-test/t/type_newdecimal.test:
Make test clean up after itself.
Diffstat (limited to 'mysql-test/t/ps_1general.test')
| -rw-r--r-- | mysql-test/t/ps_1general.test | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 5e5211ffa09..e9b8a1c95b1 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -324,9 +324,6 @@ execute stmt4; # history (actions of the bdb engine). # That is the reason why, we switch the output here off. # (The real output will be tested in ps_6bdb.test) ---disable_warnings -prepare stmt4 from ' show engine bdb logs '; ---enable_warnings --disable_result_log prepare stmt4 from ' show engine bdb logs '; execute stmt4; |