Commit 39af58db authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/ram/work/5.0.b10303


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 811c6d21 d29ecd5e

.bzrignore

+4 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ emacs.h 
extra/charset2html

extra/comp_err

extra/created_include_files

extra/innochecksum

extra/my_print_defaults

extra/mysql_install

extra/mysql_tzinfo_to_sql
@@ -477,6 +478,8 @@ libmysqld/sql_cache.cc 
libmysqld/sql_class.cc

libmysqld/sql_command

libmysqld/sql_crypt.cc

libmysqld/sql_cursor.cc

libmysqld/sql_cursor.h

libmysqld/sql_db.cc

libmysqld/sql_delete.cc

libmysqld/sql_derived.cc
@@ -858,6 +861,7 @@ ndb/test/ndbapi/testNodeRestart 
ndb/test/ndbapi/testOIBasic

ndb/test/ndbapi/testOperations

ndb/test/ndbapi/testRestartGci

ndb/test/ndbapi/testSRBank

ndb/test/ndbapi/testScan

ndb/test/ndbapi/testScan.dsp

ndb/test/ndbapi/testScanInterpreter

BUILD/FINISH.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ path=`dirname $0` 
if [ -z "$just_clean" ]

then

commands="$commands

CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \

CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \

$configure"

fi

BUILD/SETUP.sh

+13 −3
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ prefix_configs="--prefix=/usr/local/mysql" 
just_print=

just_configure=

full_debug=

if test -n "$MYSQL_BUILD_PREFIX"

then

  prefix_configs="--prefix=$MYSQL_BUILD_PREFIX"

fi



while test $# -gt 0

do

  case "$1" in
@@ -47,10 +52,11 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
#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-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-csv-storage-engine"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-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-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables"

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

max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"



path=`dirname $0`

. "$path/check-cpu"
@@ -98,6 +104,10 @@ else 
  make=make

fi



if test -z "$CC" ; then

  CC=gcc

fi



if test -z "$CXX" ; then

  CXX=gcc

fi

BUILD/autorun.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ aclocal || die "Can't execute aclocal" 
autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists 

# Added glibtoolize reference to make native OSX autotools work

if [ -f /usr/bin/glibtoolize ] ; then

if test -f /usr/bin/glibtoolize  ; then

  glibtoolize --automake --force || die "Can't execute glibtoolize"

else

  libtoolize --automake --force || die "Can't execute libtoolize"

BUILD/compile-pentium-debug-max-no-ndb

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



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium_cflags $debug_cflags $max_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"



. "$path/FINISH.sh"