Commit 72232c69 authored by unknown's avatar unknown
Browse files

information_schema.result: 

  corrected merge


mysql-test/r/information_schema.result:
  corrected merge
parent 0f404366

mysql-test/r/information_schema.result

+1 −1
Original line number Diff line number Diff line
@@ -1136,6 +1136,7 @@ table_schema='information_schema' and 
group by column_type order by num;

column_type	group_concat(table_schema, '.', table_name)	num

varchar(7)	information_schema.ROUTINES,information_schema.VIEWS	2

varchar(20)	information_schema.COLUMNS,information_schema.FILES,information_schema.FILES,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PLUGINS	6

create table t1(f1 char(1) not null, f2 char(9) not null)

default character set utf8;

select CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH from
@@ -1153,7 +1154,6 @@ routine_name 


delete from proc where name='';

use test;

varchar(20)	information_schema.COLUMNS,information_schema.FILES,information_schema.FILES,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PLUGINS	6

select * from information_schema.engines WHERE ENGINE="MyISAM";

ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS

MyISAM	ENABLED	Default engine as of MySQL 3.23 with great performance	NO	NO	NO