Commit 8aff7ae9 authored by unknown's avatar unknown
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql 

into sinisa.nasamreza.org:/mnt/work/mysql
parents 469c998b 391bc11a

include/global.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ double my_ulonglong2double(unsigned long long A); 
#define CONFIG_SMP

#include <asm/atomic.h>

#endif

#include <errno.h>				/* Recommended by debian */



/* Go around some bugs in different OS and compilers */

#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H)

mysql-test/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ CLEANFILES = $(test_SCRIPTS) 
dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

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

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

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.001 $(distdir)/std_data
@@ -41,6 +41,8 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

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

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t

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

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

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

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ run_testcase () 
 slave_opt_file=$TESTDIR/$tname-slave.opt

 master_init_script=$TESTDIR/$tname-master.sh

 slave_init_script=$TESTDIR/$tname-slave.sh

 slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt

 slave_master_info_file=$TESTDIR/$tname.slave-mi

 SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`

 if [ -n "$SKIP_TEST" ] ; then 

   SKIP_THIS_TEST=`$EXPR \( $tname : "$SKIP_TEST" \) != 0`