Commit 69221bba authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zim.(none):/home/brian/mysql/cluster-5.1


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
parents 973949d0 67c96c78

libmysqld/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	item_xmlfunc.cc \

        rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

mysql-test/r/information_schema.result

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ COLLATIONS 
COLLATION_CHARACTER_SET_APPLICABILITY

COLUMNS

COLUMN_PRIVILEGES

ENGINES

KEY_COLUMN_USAGE

PLUGINS

ROUTINES
@@ -1058,3 +1059,6 @@ where table_name="v1"; 
table_type

VIEW

drop view v1;

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

mysql-test/r/information_schema_db.result

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ COLLATIONS 
COLLATION_CHARACTER_SET_APPLICABILITY

COLUMNS

COLUMN_PRIVILEGES

ENGINES

KEY_COLUMN_USAGE

PLUGINS

ROUTINES

mysql-test/t/information_schema.test

+6 −0
Original line number Diff line number Diff line
@@ -748,3 +748,9 @@ drop table t1; 
select table_type from information_schema.tables

where table_name="v1";

drop view v1;



#

# Show engines

#



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

sql/ha_partition.cc

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ handlerton partition_hton = { 
  NULL, /* Start Consistent Snapshot */

  NULL, /* Flush logs */

  NULL, /* Show status */

  HTON_NOT_USER_SELECTABLE

  HTON_NOT_USER_SELECTABLE | HTON_HIDDEN

};



static handler *partition_create_handler(TABLE_SHARE *share)