Commit 46157438 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
parents c97775ac 27a6d7a7

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.30)

AM_INIT_AUTOMAKE(mysql, 5.0.32)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=30

NDB_VERSION_BUILD=32

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

innobase/CMakeLists.txt

+42 −0
Original line number Diff line number Diff line
@@ -2,6 +2,43 @@ 
#SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")

ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)



# Bug#19424 - InnoDB: Possibly a memory overrun of the buffer being freed (64-bit Visual C)

# Removing Win64 compiler optimizations for all innodb files.

IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

	SET_SOURCE_FILES_PROPERTIES(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 

							 dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c dict/dict0load.c dict/dict0mem.c 

							 dyn/dyn0dyn.c 

							 eval/eval0eval.c eval/eval0proc.c 

							 fil/fil0fil.c 

							 fsp/fsp0fsp.c

							 fut/fut0fut.c fut/fut0lst.c 

							 ha/ha0ha.c ha/hash0hash.c 

							 ibuf/ibuf0ibuf.c 

							 pars/lexyy.c pars/pars0grm.c pars/pars0opt.c pars/pars0pars.c pars/pars0sym.c 

							 lock/lock0lock.c

							 log/log0log.c log/log0recv.c 

							 mach/mach0data.c 

							 mem/mem0mem.c mem/mem0pool.c 

							 mtr/mtr0log.c mtr/mtr0mtr.c 

							 os/os0file.c os/os0proc.c os/os0sync.c os/os0thread.c 

							 page/page0cur.c page/page0page.c 

							 que/que0que.c 

							 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 

							 row/row0umod.c row/row0undo.c row/row0upd.c row/row0vers.c 

							 srv/srv0que.c srv/srv0srv.c srv/srv0start.c 

							 sync/sync0arr.c sync/sync0rw.c sync/sync0sync.c 

							 thr/thr0loc.c 

							 trx/trx0purge.c trx/trx0rec.c trx/trx0roll.c trx/trx0rseg.c 

                             trx/trx0sys.c trx/trx0trx.c trx/trx0undo.c 

							 usr/usr0sess.c 

							 ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c

							 PROPERTIES COMPILE_FLAGS -Od)

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 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
@@ -33,3 +70,8 @@ ADD_LIBRARY(innobase btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c 
					 trx/trx0purge.c trx/trx0rec.c trx/trx0roll.c trx/trx0rseg.c trx/trx0sys.c trx/trx0trx.c trx/trx0undo.c 

					 usr/usr0sess.c 

					 ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c )



# (Bug#19424) Removing Win64 compiler optimizations innobase project.

IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

	SET_TARGET_PROPERTIES(innobase PROPERTIES COMPILE_FLAGS "/Od")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data
@@ -87,6 +88,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/include/*.test $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

scripts/make_binary_distribution.sh

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ $CP mysql-test/lib/*.pl $BASE/mysql-test/lib 
$CP mysql-test/lib/*.sql $BASE/mysql-test/lib

$CP mysql-test/t/*.def $BASE/mysql-test/t

$CP mysql-test/include/*.inc $BASE/mysql-test/include

$CP mysql-test/include/*.test $BASE/mysql-test/include

$CP mysql-test/t/*.def $BASE/mysql-test/t

$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \

    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \