Commit d1c1dac8 authored Aug 19, 2006 by unknown

Update to push all of merge into the merge storage directory.


storage/myisammrg/ha_myisammrg.h:
  Rename: sql/ha_myisammrg.h -> storage/myisammrg/ha_myisammrg.h
storage/federated/CMakeLists.txt:
  BitKeeper file /home/brian/mysql/arch-5.1/storage/federated/CMakeLists.txt
libmysqld/Makefile.am:
  Removed mrg
sql/CMakeLists.txt:
  Removed mrg
sql/Makefile.am:
  Removed mrg
sql/handler.cc:
  Removed mrg include (no longer needed)
sql/sql_cache.cc:
  Updated include files
storage/heap/Makefile.am:
  
  Formatting
storage/myisammrg/Makefile.am:
  Updated makefile for mrg
storage/myisammrg/ha_myisammrg.cc:
  Updated Makefile

parent 39f1d9f4

libmysqld/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ 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_myisammrg.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

+2 −2

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 ha_myisammrg.cc
		filesort.cc gstream.cc ha_myisam.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
		@@ -35,7 +35,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
		item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc
		item_uniq.cc key.cc log.cc lock.cc log_event.cc message.rc
		message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
		../storage/myisammrg/myrg_rnext_same.c mysqld.cc net_serv.cc
		mysqld.cc net_serv.cc
		nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc
		../sql-common/pack.c parse_file.cc password.c procedure.cc
		protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc

sql/Makefile.am

+2 −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_myisammrg.h ha_partition.h \
		ha_myisam.h ha_partition.h \
		ha_innodb.h \
		ha_ndbcluster.h ha_ndbcluster_binlog.h \
		ha_ndbcluster_tables.h \
		@@ -87,7 +87,7 @@ 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_myisammrg.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
		@@ -24,7 +24,6 @@
		#include "mysql_priv.h"
		#include "rpl_filter.h"
		#include "ha_myisam.h"
		#include "ha_myisammrg.h"


		#include <myisampack.h>

sql/sql_cache.cc

+1 −5

Original line number	Diff line number	Diff line
		@@ -299,12 +299,8 @@ TODO list:
		#include <m_ctype.h>
		#include <my_dir.h>
		#include <hash.h>
		#include "ha_myisammrg.h"
		#ifndef MASTER
		#include "../srclib/myisammrg/myrg_def.h"
		#else
		#include "../storage/myisammrg/ha_myisammrg.h"
		#include "../storage/myisammrg/myrg_def.h"
		#endif

		#ifdef EMBEDDED_LIBRARY
		#include "emb_qcache.h"