diff options
| author | brian@zim.(none) <> | 2005-03-25 12:39:16 -0800 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-03-25 12:39:16 -0800 |
| commit | 3d2554bcef6c94cccdfc5a12eaddd86b16de630c (patch) | |
| tree | 992ac74bf5a91dd2c6b80ca4d1f555997e8a2a10 /mysql-test/r | |
| parent | 89838b1ebc78e7ecb4279b29b50e259d17e9b43f (diff) | |
| parent | 0c21adf37040feb68e77cd37badd279acf3907b4 (diff) | |
| download | mariadb-git-3d2554bcef6c94cccdfc5a12eaddd86b16de630c.tar.gz | |
Resolving merge.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 342b3e3ef06..42a7cab6051 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -342,6 +342,7 @@ EXAMPLE YES/NO Example storage engine ARCHIVE YES/NO Archive storage engine CSV YES/NO CSV storage engine FEDERATED YES/NO Federated MySQL storage engine +BLACKHOLE YES/NO Storage engine designed to act as null storage drop table if exists t5; prepare stmt1 from ' drop table if exists t5 ' ; execute stmt1 ; |