Commit 67c96c78 authored by unknown's avatar unknown
Browse files

This patch does the following: 

1) Fixes breakage in embedded server build for XMLPath push.
2) Hides PARTITION engine from view.
3) Add ENGINES information schema (and it should now be clear from this patch on how to turn any show command into an information schema).


libmysqld/Makefile.am:
  Fix for embedded server to build.
mysql-test/r/information_schema.result:
  Fix for additional information_schema
mysql-test/r/information_schema_db.result:
  Fix for adding additional engines information schema.
mysql-test/t/information_schema.test:
  Added test to make sure that engines information schema works.
sql/ha_partition.cc:
  Made PARTITION hidden in information schema.
sql/sql_parse.cc:
  Added additional case for engine information schema.
sql/sql_show.cc:
  Code for ENGINES information schema.
sql/sql_yacc.yy:
  Extended grammer to support new ENGINES information schema
sql/table.h:
  Comment on dependency in information schema.
libmysqld/item_xmlfunc.cc:
  New BitKeeper file ``libmysqld/item_xmlfunc.cc''
parent ec6121fb

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

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

COLUMNS

COLUMN_PRIVILEGES

ENGINES

KEY_COLUMN_USAGE

ROUTINES

SCHEMATA
@@ -723,7 +724,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); 
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;

CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;

count(*)

102

103

drop view a2, a1;

drop table t_crashme;

select table_schema,table_name, column_name from
@@ -793,7 +794,7 @@ delete from mysql.db where user='mysqltest_4'; 
flush privileges;

SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;

table_schema	count(*)

information_schema	16

information_schema	17

mysql	18

create table t1 (i int, j int);

create trigger trg1 before insert on t1 for each row
@@ -1056,3 +1057,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

ROUTINES

SCHEMATA

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
@@ -98,7 +98,7 @@ handlerton partition_hton = { 
  NULL, /* Flush logs */

  NULL, /* Show status */

  NULL, /* Replication Report Sent Binlog */

  HTON_NOT_USER_SELECTABLE

  HTON_NOT_USER_SELECTABLE | HTON_HIDDEN

};



static handler *partition_create_handler(TABLE_SHARE *share)