diff options
| author | unknown <brian@zim.(none)> | 2005-03-25 12:39:16 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-03-25 12:39:16 -0800 |
| commit | 752b825a7360b1adc0ef390369f6bd5a86366d45 (patch) | |
| tree | 992ac74bf5a91dd2c6b80ca4d1f555997e8a2a10 /mysql-test/r/ps_1general.result | |
| parent | deded715131d9cd5abf65e6d354e8353720ad277 (diff) | |
| parent | fdd4cb8fb8d32789bea7042760a0662192713681 (diff) | |
| download | mariadb-git-752b825a7360b1adc0ef390369f6bd5a86366d45.tar.gz | |
Resolving merge.
sql/handler.h:
Auto merged
mysql-test/r/ps_1general.result:
Resolving conflict in layout.
Diffstat (limited to 'mysql-test/r/ps_1general.result')
| -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 ; |