Commit 616df893 authored by unknown's avatar unknown
Browse files

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

into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents 4ba66405 644a444b

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-partition"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables --with-partition"

max_configs="$base_max_configs --with-embedded-server"



path=`dirname $0`

BUILD/compile-pentium-icc

+7 −20
Original line number Diff line number Diff line
@@ -8,29 +8,16 @@ path=`dirname $0` 
CC=icc

CXX=icpc

CXXLD="$CXX -static-libcxa"

export CC CXX





extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"



# Disable following warnings as these are generated by header files:

# 161   unrecognized pragma

# 444   destructor for base class xxx is not virtual

# 279   controlling expression is constant

# 810   conversion from ulonglong to ulong with cast

# 981   operands are evaluated in unspecified order

# 1292  warning for unknown 'attribute' options

# 1469  "xxx" clobber ignored

# 1572  floating-point equality and inequality comparisons are unreliable



# In C++

# 869    parameter "xxx" was never referenced

#        (Problem with virtual functions)

# 874   support for placement delete is disabled

export CC CXX CXXLD



c_warnings=""

cxx_warnings=""

extra_flags="-O3 -unroll2 -ip -mp -no-gcc -restrict"

extra_flags="$fast_cflags -unroll2 -ip -mp -restrict"



# Use -no-ipo if you get this error

# IPO link: can not find "-lstdc++_shared"

# icpc: error: problem during multi-file optimization compilation (code 1)

extra_flags="$extra_flags -no-ipo"

base_cxxflags="-fno-exceptions -fno-rtti"

extra_configs="$pentium_configs $static_link"

BUILD/compile-pentium-icc-yassl

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



# Note that we can't use ccache with icc as the generated .deps file will

# then contain wrong information

CC=icc

CXX=icpc

CXXLD="$CXX -static-libcxa"

export CC CXX CXXLD



c_warnings=""

cxx_warnings=""

extra_flags="$fast_cflags -unroll2 -ip -mp -restrict"



# Use -no-ipo if you get this error

# IPO link: can not find "-lstdc++_shared"

# icpc: error: problem during multi-file optimization compilation (code 1)

extra_flags="$extra_flags -no-ipo"

base_cxxflags="-fno-exceptions -fno-rtti"

extra_configs="$pentium_configs $static_link --with-yassl"



. "$path/FINISH.sh"

BitKeeper/etc/config

+0 −5
Original line number Diff line number Diff line
@@ -75,8 +75,3 @@ hours: 
[tomas:]checkout:get

checkout:edit

eoln:unix
 


license: BKL5433d4e6925a06a150001200fff9b

licsign1: YgAAAo0AAAADgAAAAEYUtZil1XCmH6z+LTlQMDJ+1ZeBLIgtHo1azUxQ8/8G1JuW

licsign2: fxW3y9raSlpYVAleJSaBDKYiVtEuSdaUN2ILLo6Wc8TJmLl0aprUy7Lh/m/Sq/YC

licsign3: 0H7qah3bdItuw7NGNSLfBzigbKOF6kPbU84VlAUhOqLR2e5Zf32SBZhtCYGA

Makefile.am

+18 −3
Original line number Diff line number Diff line
@@ -105,10 +105,25 @@ test: 
	cd mysql-test; \

	./mysql-test-run && ./mysql-test-run --ps-protocol



# Test installation. Ports are configurable from the environment.



MYSQL_TEST_MANAGER_PORT =	9305

MYSQL_TEST_MASTER_PORT =	9306

MYSQL_TEST_SLAVE_PORT =		9308

MYSQL_TEST_NDB_PORT =		9350

MYSQL_TEST_RUN_ARGS =		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

				--master_port=$(MYSQL_TEST_MASTER_PORT) \

				--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

				--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)

test:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS)



test-force:

	cd mysql-test ; \

	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force

	./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \

	./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS)



# Don't update the files from bitkeeper

%::SCCS/s.%