From 6b3a9caef9b8cf42f8a706f778bba72db89cdd2b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Nov 2005 16:25:06 +0100 Subject: Make storage engines "pluggable", handlerton work Makefile.am: Changes to autoconf subst config/ac-macros/ha_berkeley.m4: simplify config/ac-macros/ha_ndbcluster.m4: simplify config/ac-macros/ha_partition.m4: simplify configure.in: strip configure of storage engine specific cruft and simplify extra/Makefile.am: changes to autoconf/automake subst libmysqld/Makefile.am: only compile storage engines if required. make find object file a little smarter libmysqld/examples/Makefile.am: changes to autoconf subst mysql-test/Makefile.am: remove storage engine specific cruft mysql-test/r/ps_1general.result: cannot gaurantee order of results from 'show storage engines' mysql-test/r/show_check.result: fix test - frm file fails to be deleted if it is invalid mysql-test/r/sql_mode.result: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/r/warnings.result: isam no longer exists mysql-test/t/ps_1general.test: cannot gaurantee order of results from 'show storage engines' mysql-test/t/show_check.test: fix test - frm file fails to be deleted if it is invalid mysql-test/t/sql_mode.test: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/t/system_mysql_db_fix.test: change isam to myisam mysql-test/t/view.test: change isam to myisam mysql-test/t/warnings.test: isam no longer exists sql/Makefile.am: Make storage engines "pluggable" stage 1 only compile storage engines if included sql/examples/ha_example.cc: handlerton work sql/examples/ha_example.h: handlerton work sql/examples/ha_tina.cc: handlerton work sql/examples/ha_tina.h: handlerton work sql/ha_archive.cc: handlerton work sql/ha_archive.h: handlerton work sql/ha_berkeley.cc: handlerton work sql/ha_berkeley.h: handlerton work sql/ha_blackhole.cc: handlerton work sql/ha_federated.cc: handlerton work sql/ha_federated.h: handlerton work sql/ha_heap.cc: handlerton work sql/ha_innodb.cc: handlerton work sql/ha_innodb.h: handlerton work sql/ha_myisam.cc: handlerton work sql/ha_myisammrg.cc: handlerton work sql/ha_ndbcluster.cc: handlerton work sql/ha_ndbcluster.h: handlerton work sql/ha_partition.cc: handlerton work sql/handler.cc: start removing storage engine specific cruft sql/handler.h: start removing storage engine specific cruft db_type for binlog handlerton handlerton flag for not-user-selectable storage engines sql/lex.h: start removing storage engine specific cruft sql/log.cc: handlerton work give binlog handlerton a 'real' db_type sql/mysql_priv.h: start removing storage engine specific cruft sql/mysqld.cc: start removing storage engine specific cruft sql/set_var.cc: start removing storage engine specific cruft sql/sp_head.cc: start removing storage engine specific cruft sql/sql_class.cc: start removing storage engine specific cruft sql/sql_class.h: start removing storage engine specific cruft sql/sql_lex.h: start removing storage engine specific cruft sql/sql_manager.cc: start removing storage engine specific cruft sql/sql_manager.h: start removing storage engine specific cruft sql/sql_parse.cc: start removing storage engine specific cruft sql/sql_partition.cc: start removing storage engine specific cruft sql/sql_prepare.cc: start removing storage engine specific cruft sql/sql_show.cc: start removing storage engine specific cruft sql/sql_table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE start removing storage engine specific cruft sql/sql_update.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/sql_yacc.yy: start removing storage engine specific cruft test if we should throw error sql/table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/table.h: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/unireg.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE storage/ndb/include/kernel/kernel_types.h: added my_config.h storage/ndb/include/ndb_global.h.in: added my_config.h storage/ndb/include/ndb_types.h.in: added my_config.h config/ac-macros/storage.m4: New BitKeeper file ``config/ac-macros/storage.m4'' sql/handlerton.cc.in: New BitKeeper file ``sql/handlerton.cc.in'' --- storage/ndb/include/kernel/kernel_types.h | 1 + storage/ndb/include/ndb_global.h.in | 1 + storage/ndb/include/ndb_types.h.in | 14 ++++++++------ 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'storage') diff --git a/storage/ndb/include/kernel/kernel_types.h b/storage/ndb/include/kernel/kernel_types.h index e16e61471e7..ba772fa6b31 100644 --- a/storage/ndb/include/kernel/kernel_types.h +++ b/storage/ndb/include/kernel/kernel_types.h @@ -17,6 +17,7 @@ #ifndef NDB_KERNEL_TYPES_H #define NDB_KERNEL_TYPES_H +#include #include typedef Uint16 NodeId; diff --git a/storage/ndb/include/ndb_global.h.in b/storage/ndb/include/ndb_global.h.in index 43f90e1f8b5..7d92ae76f83 100644 --- a/storage/ndb/include/ndb_global.h.in +++ b/storage/ndb/include/ndb_global.h.in @@ -17,6 +17,7 @@ #ifndef NDB_GLOBAL_H #define NDB_GLOBAL_H +#include #include #define NDB_PORT "@ndb_port@" diff --git a/storage/ndb/include/ndb_types.h.in b/storage/ndb/include/ndb_types.h.in index 2a5d576ffea..c657ce4f075 100644 --- a/storage/ndb/include/ndb_types.h.in +++ b/storage/ndb/include/ndb_types.h.in @@ -21,6 +21,8 @@ #ifndef NDB_TYPES_H #define NDB_TYPES_H +#include + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64) #define NDB_SIZEOF_CHARP SIZEOF_CHARP #define NDB_SIZEOF_CHAR SIZEOF_CHAR @@ -31,12 +33,12 @@ typedef unsigned __int64 Uint64; typedef signed __int64 Int64; #else -#define NDB_SIZEOF_CHARP @NDB_SIZEOF_CHARP@ -#define NDB_SIZEOF_CHAR @NDB_SIZEOF_CHAR@ -#define NDB_SIZEOF_INT @NDB_SIZEOF_INT@ -#define NDB_SIZEOF_SHORT @NDB_SIZEOF_SHORT@ -#define NDB_SIZEOF_LONG @NDB_SIZEOF_LONG@ -#define NDB_SIZEOF_LONG_LONG @NDB_SIZEOF_LONG_LONG@ +#define NDB_SIZEOF_CHARP SIZEOF_CHARP +#define NDB_SIZEOF_CHAR SIZEOF_CHAR +#define NDB_SIZEOF_INT SIZEOF_INT +#define NDB_SIZEOF_SHORT SIZEOF_SHORT +#define NDB_SIZEOF_LONG SIZEOF_LONG +#define NDB_SIZEOF_LONG_LONG SIZEOF_LONG_LONG typedef unsigned long long Uint64; typedef signed long long Int64; #endif -- cgit v1.2.1