Commit cfafd458 authored Aug 19, 2006 by unknown

This changeset moves the ha_myisam files to their storage directories. It...

This changeset moves the ha_myisam files to their storage directories.  It also includes updates for all engines include patch for windows builds. 


storage/myisam/ha_myisam.h:
  Rename: sql/ha_myisam.h -> storage/myisam/ha_myisam.h
libmysqld/Makefile.am:
  Removing myisam
sql/CMakeLists.txt:
  removing myisam reference
sql/Makefile.am:
  Removing myisam reference.
sql/handler.cc:
  Removing unneeded include reference
sql/mysqld.cc:
  updating include reference
storage/archive/CMakeLists.txt:
  Update windows include
storage/blackhole/CMakeLists.txt:
  Update windows include
storage/csv/CMakeLists.txt:
  Update Windows include
storage/example/CMakeLists.txt:
  Update windows include
storage/federated/CMakeLists.txt:
  Update windows include
storage/heap/CMakeLists.txt:
  
  Update windows include
storage/myisam/CMakeLists.txt:
  Adding ha_myisam reference
storage/myisam/Makefile.am:
  Updatinng Makefile.am
storage/myisam/ha_myisam.cc:
  Updating include reference
storage/myisammrg/CMakeLists.txt:
  Update windows include

parent d1c1dac8

libmysqld/Makefile.am

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
		noinst_HEADERS = embedded_priv.h emb_qcache.h

		sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
		ha_myisam.cc \
		ha_innodb.cc ha_ndbcluster.cc \
		ha_ndbcluster_binlog.cc ha_partition.cc \
		handler.cc sql_handler.cc \

sql/CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER

		ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
		discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
		filesort.cc gstream.cc ha_myisam.cc
		filesort.cc gstream.cc
		ha_innodb.cc ha_partition.cc
		handler.cc hash_filo.cc hash_filo.h
		hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc

sql/Makefile.am

+1 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
		procedure.h sql_class.h sql_lex.h sql_list.h \
		sql_map.h sql_string.h unireg.h \
		sql_error.h field.h handler.h mysqld_suffix.h \
		ha_myisam.h ha_partition.h \
		ha_partition.h \
		ha_innodb.h \
		ha_ndbcluster.h ha_ndbcluster_binlog.h \
		ha_ndbcluster_tables.h \
		@@ -87,7 +87,6 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \
		unireg.cc des_key_file.cc \
		discover.cc time.cc opt_range.cc opt_sum.cc \
		records.cc filesort.cc handler.cc \
		ha_myisam.cc \
		ha_partition.cc ha_innodb.cc \
		ha_ndbcluster.cc ha_ndbcluster_binlog.cc \
		sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \

sql/handler.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@

		#include "mysql_priv.h"
		#include "rpl_filter.h"
		#include "ha_myisam.h"


		#include <myisampack.h>

sql/mysqld.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@
		#include "mysys_err.h"
		#include "events.h"

		#include "ha_myisam.h"
		#include "../storage/myisam/ha_myisam.h"

		#ifdef HAVE_ROW_BASED_REPLICATION
		#include "rpl_injector.h"