Commit d17ac133 authored by unknown's avatar unknown
Browse files

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

into  zim.(none):/home/brian/mysql/merge-5.1
parents c85e25f2 b098f25d

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_innodb.cc ha_ndbcluster.cc \

	     ha_ndbcluster.cc \

	ha_ndbcluster_binlog.cc ha_partition.cc \

	handler.cc sql_handler.cc \

	hostname.cc init.cc password.c \

sql/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			sql_map.h sql_string.h unireg.h \

			sql_error.h field.h handler.h mysqld_suffix.h \

			ha_partition.h \

			ha_innodb.h  \

			ha_ndbcluster.h ha_ndbcluster_binlog.h \

			ha_ndbcluster_tables.h \

			opt_range.h protocol.h rpl_tblmap.h \
@@ -87,7 +86,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_partition.cc ha_innodb.cc \

			ha_partition.cc \

                        ha_ndbcluster.cc ha_ndbcluster_binlog.cc \

			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \

			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \

storage/innobase/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")

ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include include)

INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/handler include)

ADD_LIBRARY(innobase btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c 

					 buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c 

					 data/data0data.c data/data0type.c
@@ -23,6 +23,7 @@ ADD_LIBRARY(innobase btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c 
					 os/os0file.c os/os0proc.c os/os0sync.c os/os0thread.c 

					 page/page0cur.c page/page0page.c 

					 que/que0que.c 

					 handler/ha_innodb.cc

					 read/read0read.c 

					 rem/rem0cmp.c rem/rem0rec.c

					 row/row0ins.c row/row0mysql.c row/row0purge.c row/row0row.c row/row0sel.c row/row0uins.c

storage/innobase/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ noinst_HEADERS = 


SUBDIRS =		os ut btr buf data dict dyn eval fil fsp fut \

			ha ibuf lock log mach mem mtr page \

			handler \

			pars que read rem row srv sync thr trx usr



EXTRA_DIST = 	include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr0cur.ic \
@@ -86,6 +87,7 @@ EXTRA_DIST = include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr 
		include/univ.i include/usr0sess.h include/usr0sess.ic include/usr0types.h \

		include/ut0byte.h include/ut0byte.ic include/ut0dbg.h include/ut0lst.h \

		include/ut0mem.h include/ut0mem.ic include/ut0rnd.h include/ut0rnd.ic \

		handler/ha_innodb.h \

		include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic include/ha_prototypes.h \

		include/ut0list.h include/ut0list.ic \

		include/ut0wqueue.h \
@@ -102,6 +104,7 @@ libinnobase_a_LIBADD = usr/libusr.a srv/libsrv.a dict/libdict.a \ 
			page/libpage.a rem/librem.a thr/libthr.a \

			sync/libsync.a data/libdata.a mach/libmach.a \

			ha/libha.a dyn/libdyn.a mem/libmem.a \

			handler/libhandler.a \

			ut/libut.a os/libos.a ut/libut.a

libinnobase_a_SOURCES =

storage/innobase/handler/Makefile.am

0 → 100644
+29 −0
Original line number Diff line number Diff line 
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

# & Innobase Oy

# 

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

# 

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

# 

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



include ../include/Makefile.i



DEFS =			-DMYSQL_SERVER @DEFS@



noinst_LIBRARIES =	libhandler.a



libhandler_a_SOURCES =	ha_innodb.cc



EXTRA_PROGRAMS =	



# Don't update the files from bitkeeper

%::SCCS/s.%