Commit 30de4903 authored by unknown's avatar unknown
Browse files

Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/create_not_windows.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  manuakl merge
mysql-test/lib/mtr_process.pl:
  manuakl merge
mysql-test/mysql-test-run.pl:
  manuakl merge
mysql-test/r/type_newdecimal.result:
  manuakl merge
mysql-test/t/create.test:
  manuakl merge
mysql-test/t/func_group.test:
  manuakl merge
mysql-test/t/type_newdecimal.test:
  manuakl merge
parents f92fd7c9 2ef57b83

.bzrignore

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
*.d

*.da

*.exe

*.gcda

*.gcno

*.gcov

*.idb

*.la
@@ -462,6 +464,7 @@ libmysqld/event.cc 
libmysqld/event_executor.cc

libmysqld/event_scheduler.cc

libmysqld/event_timed.cc

libmysqld/events.cc

libmysqld/examples/client_test.c

libmysqld/examples/client_test.cc

libmysqld/examples/completion_hash.cc
@@ -1117,6 +1120,7 @@ server-tools/instance-manager/messages.cpp 
server-tools/instance-manager/mysql_connection.cpp

server-tools/instance-manager/mysqlmanager

server-tools/instance-manager/mysqlmanager.cpp

server-tools/instance-manager/net_serv.cc

server-tools/instance-manager/options.cpp

server-tools/instance-manager/parse.cpp

server-tools/instance-manager/parse_output.cpp

BUILD/compile-dist

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# tree can then be picked up by "make dist" to create the "pristine source

# package" that is used as the basis for all other binary builds.

#

make distclean

test -f Makefile && make distclean

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

BUILD/compile-ndb-autotest

0 → 100755
+9 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$fast_cflags $max_cflags -g"

extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags="-DERROR_INSERT""



. "$path/FINISH.sh"

BUILD/compile-pentium-gcov

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage" 
# The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the

# code with profiling information used by gcov.

# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM"

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM -DHAVE_MUTEX_THREAD_ONLY"

extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

extra_configs="$extra_configs $max_configs"

Makefile.am

+24 −19
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ dist-hook: 


tags:

	support-files/build-tags

.PHONY:		init-db bin-dist



.PHONY:	init-db bin-dist test test-full test-ps test-nr \

	test-ns test-pr test-unit



# Target 'test' will run the regression test suite using the built server.

#
@@ -111,29 +113,34 @@ tags: 
# will then calculate the various port numbers it needs from this,

# making sure each user use different ports.



test:

test-unit:

	cd unittest && $(MAKE) test



test-ps:

	cd mysql-test ; \

	./mysql-test-run.pl --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=statement



test-full:

test-nr:

	cd mysql-test ; \

	./mysql-test-run.pl --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --mysqld=--binlog-format=row && \

	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=row



test-force:

test-pr:

	cd mysql-test ; \

	./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row



test-force-full:

test-ns:

	cd mysql-test ; \

	./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --force --mysqld=--binlog-format=row && \

	./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement



test:	test-unit test-ns test-pr



test-full:	test test-nr test-ps



test-force:

	$(MAKE) force=--force test



test-force-full:

	$(MAKE) force=--force test-full



# Keep these for a while

test-pl:	test
@@ -141,8 +148,6 @@ test-full-pl: test-full 
test-force-pl:	test-force

test-force-full-pl: test-force-full







# Don't update the files from bitkeeper

%::SCCS/s.%