Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release (df333b1f) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysql_upgrade.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -375,14 +375,17 @@ static int comp_names(struct fileinfo a, struct fileinfo b)
		}


		static int
		find_file(const char name, const char root, uint flags, char *result, size_t len, ...)
		static int find_file(const char name, const char root,
		uint flags, char *result, size_t len, ...)
		{
		int ret;
		int ret= 1;
		va_list va;
		FILEINFO key= { (char*)name, NULL };
		const char *subdir;
		char *cp;
		FILEINFO key;

		/* Init key with name of the file to look for */
		key.name= (char*)name;

		DBUG_ASSERT(root != NULL);

		@@ -390,7 +393,6 @@ find_file(const char name, const char root, uint flags, char *result, size_t l
		if (cp[-1] != FN_LIBCHAR)
		*cp++= FN_LIBCHAR;

		ret= 1;
		va_start(va, len);
		subdir= (!(flags & MY_SEARCH_SELF)) ? va_arg(va, char *) : "";
		while (subdir)

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
		@@ -59,6 +59,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
		@@ -88,6 +89,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

mysql-test/install_test_db.sh

+12 −5

Original line number	Diff line number	Diff line
		#!/bin/sh
		# Copyright (C) 1997-2002 MySQL AB
		# Copyright (C) 1997-2006 MySQL AB
		# For a more info consult the file COPYRIGHT distributed with this file

		# This scripts creates the privilege tables db, host, user, tables_priv,
		@@ -7,19 +7,26 @@

		if [ x$1 = x"--bin" ]; then
		shift 1
		BINARY_DIST=1

		bindir=../bin
		scriptdir=../bin
		libexecdir=../libexec

		# Check if it's a binary distribution or a 'make install'
		if test -x ../libexec/mysqld
		then
		execdir=../libexec
		elif test -x ../../sbin/mysqld # RPM installation
		then
		execdir=../../sbin
		bindir=../../bin
		scriptdir=../../bin
		libexecdir=../../libexec
		else
		execdir=../bin
		fi
		bindir=../bin
		BINARY_DIST=1
		fix_bin=mysql-test
		scriptdir=../bin
		libexecdir=../libexec
		else
		execdir=../sql
		bindir=../client

mysql-test/mysql-test-run-shell.sh

+28 −10

Original line number	Diff line number	Diff line
		@@ -174,18 +174,29 @@ fi
		# Misc. Definitions
		#--

		if [ -d ../sql ] ; then
		# BASEDIR is always above mysql-test directory ...
		MYSQL_TEST_DIR=`pwd`
		cd ..

		if [ -d ./sql ] ; then
		SOURCE_DIST=1
		else
		BINARY_DIST=1
		fi

		#BASEDIR is always one above mysql-test directory
		CWD=`pwd`
		# ... one level for tar.gz, two levels for a RPM installation
		if [ -d ./bin ] ; then
		# this is not perfect: we have
		# /usr/share/mysql/ # mysql-test-run is here, so this is "$MYSQL_TEST_DIR"
		# /usr/bin/ # with MySQL client programs
		# so the existence of "/usr/share/bin/" would make this test fail.
		BASEDIR=`pwd`
		else
		cd ..
		BASEDIR=`pwd`
		cd $CWD
		MYSQL_TEST_DIR=$BASEDIR/mysql-test
		fi

		cd $MYSQL_TEST_DIR
		MYSQL_TEST_WINDIR=$MYSQL_TEST_DIR
		MYSQLTEST_VARDIR=$MYSQL_TEST_DIR/var
		export MYSQL_TEST_DIR MYSQL_TEST_WINDIR MYSQLTEST_VARDIR
		@@ -744,8 +755,15 @@ else
		if test -x "$BASEDIR/libexec/mysqld"
		then
		MYSQLD="$VALGRIND $BASEDIR/libexec/mysqld"
		else
		elif test -x "$BASEDIR/bin/mysqld"
		then
		MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
		elif test -x "$BASEDIR/sbin/mysqld"
		then
		MYSQLD="$VALGRIND $BASEDIR/sbin/mysqld"
		else
		$ECHO "Fatal error: Cannot find program mysqld in $BASEDIR/{libexec,bin,sbin}" 1>&2
		exit 1
		fi
		CLIENT_BINDIR="$BASEDIR/bin"
		if test -d "$BASEDIR/tests"
		@@ -1390,7 +1408,7 @@ start_master()
		then
		$ECHO "set args $master_args" > $GDB_MASTER_INIT$1
		$ECHO "To start gdb for the master , type in another window:"
		$ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD"
		$ECHO "cd $MYSQL_TEST_DIR ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD"
		wait_for_master=1500
		else
		( $ECHO set args $master_args;
		@@ -1508,7 +1526,7 @@ start_slave()
		then
		$ECHO "set args $slave_args" > $GDB_SLAVE_INIT
		echo "To start gdb for the slave, type in another window:"
		echo "cd $CWD ; gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD"
		echo "cd $MYSQL_TEST_DIR ; gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD"
		wait_for_slave=1500
		else
		( $ECHO set args $slave_args;