Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2286 06/04/05 16:50:12 konstantin@stripped +16 -0
Remove dead code from BUILD/ scripts.
BUILD/compile-ppc-max
1.5 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-ppc-debug-max
1.5 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-ppc-debug-max-no-ndb
1.2 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-pentium64-valgrind-max
1.3 06/04/05 16:50:06 konstantin@stripped +2 -5
Remove dead options. There is no ISAM any more.
BUILD/compile-pentium64-debug-max
1.2 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-pentium-valgrind-max
1.14 06/04/05 16:50:06 konstantin@stripped +2 -5
Remove dead options. There is no ISAM any more.
BUILD/compile-pentium-max
1.15 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-pentium-icc-valgrind-max
1.2 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-pentium-debug-max
1.18 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-pentium-debug-max-no-ndb
1.2 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-pentium-debug-max-no-embedded
1.5 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-darwin-mwcc
1.2 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-amd64-max
1.3 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-amd64-debug-max
1.3 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/compile-amd64-debug-max-no-ndb
1.2 06/04/05 16:50:06 konstantin@stripped +1 -1
Remove dead options.
BUILD/SETUP.sh
1.56 06/04/05 16:50:06 konstantin@stripped +1 -2
Remove dead options.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: konstantin
# Host: dragonfly.local
# Root: /opt/local/work/mysql-5.1-root
--- 1.4/BUILD/compile-pentium-debug-max-no-embedded 2005-07-15 22:15:40 +04:00
+++ 1.5/BUILD/compile-pentium-debug-max-no-embedded 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$pentium_cflags $debug_cflags $max_cflags"
+extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs $base_max_configs"
--- 1.2/BUILD/compile-pentium64-valgrind-max 2005-11-07 18:18:31 +03:00
+++ 1.3/BUILD/compile-pentium64-valgrind-max 2006-04-05 16:50:06 +04:00
@@ -3,13 +3,10 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$pentium64_cflags $debug_cflags $max_cflags -USAFEMALLOC
-UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium64_cflags $debug_cflags $valgrind_flags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-# We want to test isam when building with valgrind
-extra_configs="$extra_configs $max_leave_isam_configs --with-isam"
+extra_configs="$pentium_configs $debug_configs $max_configs"
. "$path/FINISH.sh"
--- 1.1/BUILD/compile-pentium64-debug-max 2005-11-03 12:18:14 +03:00
+++ 1.2/BUILD/compile-pentium64-debug-max 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh" $@ --with-debug=full
-extra_flags="$pentium64_cflags $debug_cflags $max_cflags"
+extra_flags="$pentium64_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs $max_configs"
--- 1.2/BUILD/compile-amd64-debug-max 2005-01-19 21:21:42 +03:00
+++ 1.3/BUILD/compile-amd64-debug-max 2006-04-05 16:50:06 +04:00
@@ -1,7 +1,7 @@
#! /bin/sh
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$amd64_cflags $debug_cflags $max_cflags"
+extra_flags="$amd64_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$amd64_configs $debug_configs $max_configs"
--- 1.2/BUILD/compile-amd64-max 2005-01-19 21:00:19 +03:00
+++ 1.3/BUILD/compile-amd64-max 2006-04-05 16:50:06 +04:00
@@ -2,7 +2,7 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"
+extra_flags="$amd64_cflags $fast_cflags -g"
extra_configs="$amd64_configs $max_configs"
. "$path/FINISH.sh"
--- 1.1/BUILD/compile-darwin-mwcc 2005-05-05 11:33:41 +04:00
+++ 1.2/BUILD/compile-darwin-mwcc 2006-04-05 16:50:06 +04:00
@@ -36,7 +36,7 @@
extra_configs="$debug_configs"
;;
debug-max)
- extra_flags="$ppc_cflags $debug_cflags $max_cflags"
+ extra_flags="$ppc_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$debug_configs $max_configs"
--- 1.4/BUILD/compile-ppc-debug-max 2005-01-19 21:00:45 +03:00
+++ 1.5/BUILD/compile-ppc-debug-max 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$ppc_cflags $debug_cflags $max_cflags"
+extra_flags="$ppc_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$debug_configs $max_configs"
--- 1.4/BUILD/compile-ppc-max 2005-01-19 21:00:48 +03:00
+++ 1.5/BUILD/compile-ppc-max 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$ppc_cflags $fast_cflags $max_cflags -g"
+extra_flags="$ppc_cflags $fast_cflags -g"
extra_configs="$extra_configs $max_configs"
. "$path/FINISH.sh"
--- 1.13/BUILD/compile-pentium-valgrind-max 2005-01-19 21:00:40 +03:00
+++ 1.14/BUILD/compile-pentium-valgrind-max 2006-04-05 16:50:06 +04:00
@@ -3,13 +3,10 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS
-DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-# We want to test isam when building with valgrind
-extra_configs="$extra_configs $max_leave_isam_configs --with-isam"
+extra_configs="$pentium_configs $debug_configs $max_configs"
. "$path/FINISH.sh"
--- 1.1/BUILD/compile-pentium-icc-valgrind-max 2005-05-18 20:00:15 +04:00
+++ 1.2/BUILD/compile-pentium-icc-valgrind-max 2006-04-05 16:50:06 +04:00
@@ -9,7 +9,7 @@
CXX=icpc
export CC CXX
-extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS
-DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
# Disable following warnings as these are generated by header files:
# 161 unrecognized pragma
--- 1.1/BUILD/compile-amd64-debug-max-no-ndb 2005-12-30 19:05:08 +03:00
+++ 1.2/BUILD/compile-amd64-debug-max-no-ndb 2006-04-05 16:50:06 +04:00
@@ -1,7 +1,7 @@
#! /bin/sh
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$amd64_cflags $debug_cflags $max_cflags"
+extra_flags="$amd64_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$amd64_configs $debug_configs $max_no_ndb_configs"
--- 1.1/BUILD/compile-pentium-debug-max-no-ndb 2005-09-30 00:45:29 +04:00
+++ 1.2/BUILD/compile-pentium-debug-max-no-ndb 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh" $@ --with-debug=full
-extra_flags="$pentium_cflags $debug_cflags $max_cflags"
+extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs"
--- 1.1/BUILD/compile-ppc-debug-max-no-ndb 2005-09-30 00:45:30 +04:00
+++ 1.2/BUILD/compile-ppc-debug-max-no-ndb 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$ppc_cflags $debug_cflags $max_cflags"
+extra_flags="$ppc_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$debug_configs $max_no_ndb_configs"
--- 1.17/BUILD/compile-pentium-debug-max 2005-02-05 17:05:42 +03:00
+++ 1.18/BUILD/compile-pentium-debug-max 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh" $@ --with-debug=full
-extra_flags="$pentium_cflags $debug_cflags $max_cflags"
+extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs $max_configs"
--- 1.14/BUILD/compile-pentium-max 2005-01-19 21:00:38 +03:00
+++ 1.15/BUILD/compile-pentium-max 2006-04-05 16:50:06 +04:00
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$pentium_cflags $fast_cflags $max_cflags -g"
+extra_flags="$pentium_cflags $fast_cflags -g"
extra_configs="$pentium_configs $max_configs"
. "$path/FINISH.sh"
--- 1.55/BUILD/SETUP.sh 2006-04-03 22:51:53 +04:00
+++ 1.56/BUILD/SETUP.sh 2006-04-05 16:50:06 +04:00
@@ -53,14 +53,13 @@
# __attribute()__ doesn't work with gnu C++)
global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W
-Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"
-#debug_extra_warnings="-Wuninitialized"
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-big-tables --with-blackhole-storage-engine
--with-federated-storage-engine --with-csv-storage-engine --with-example-storage-engine
--with-partition $SSL_LIBRARY"
base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster
--with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine
--with-federated-storage-engine --with-csv-storage-engine --with-example-storage-engine
--with-partition $SSL_LIBRARY"
-max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster
--with-archive-storage-engine --with-federated-storage-engine
--with-blackhole-storage-engine --with-csv-storage-engine --with-example-storage-engine
--with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY"
max_configs="$base_max_configs --with-embedded-server"
max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"
+valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify
-DMYSQL_SERVER_SUFFIX=-valgrind-max"
path=`dirname $0`
. "$path/check-cpu"
| Thread |
|---|
| • bk commit into 5.1 tree (konstantin:1.2286) | konstantin | 5 Apr |