Commit f32eb834 authored by unknown's avatar unknown
Browse files

Get ps_1general test to pass (replace .result with .reject - some text 

was changed in the SHOW STORAGE ENGINES results)


mysql-test/r/ps_1general.result:
  SHOW STORAGE ENGINES now has different text ("type" -> "engine", etc.)
parent 784191d9

mysql-test/r/ps_1general.result

+7 −7
Original line number Diff line number Diff line
@@ -302,18 +302,18 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye 
prepare stmt4 from ' show storage engines ';

execute stmt4;

Engine	Support	Comment

MyISAM	YES/NO	Default type from 3.23 with great performance

HEAP	YES/NO	Hash based, stored in memory, useful for temporary tables

MEMORY	YES/NO	Alias for HEAP

MyISAM	YES/NO	Default engine as of MySQL 3.23 with great performance

HEAP	YES/NO	Alias for MEMORY

MEMORY	YES/NO	Hash based, stored in memory, useful for temporary tables

MERGE	YES/NO	Collection of identical MyISAM tables

MRG_MYISAM	YES/NO	Alias for MERGE

ISAM	YES/NO	Obsolete table type; Is replaced by MyISAM

MRG_ISAM	YES/NO	Obsolete table type; Is replaced by MRG_MYISAM

InnoDB	YES/NO	Supports transactions, row-level locking and foreign keys

ISAM	YES/NO	Obsolete storage engine, now replaced by MyISAM

MRG_ISAM	YES/NO	Obsolete storage engine, now replaced by MERGE

InnoDB	YES/NO	Supports transactions, row-level locking, and foreign keys

INNOBASE	YES/NO	Alias for INNODB

BDB	YES/NO	Supports transactions and page-level locking

BERKELEYDB	YES/NO	Alias for BDB

NDBCLUSTER	YES/NO	Clustered, fault tolerant memory based tables

NDBCLUSTER	YES/NO	Clustered, fault-tolerant, memory-based tables

NDB	YES/NO	Alias for NDBCLUSTER

EXAMPLE	YES/NO	Example storage engine

ARCHIVE	YES/NO	Archive storage engine