Commit 752b825a authored by unknown's avatar unknown
Browse files

Resolving merge. 


sql/handler.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Resolving conflict in layout.
parents deded715 fdd4cb8f

mysql-test/r/ps_1general.result

+1 −0
Original line number Diff line number Diff line
@@ -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 ;