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

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

into  zim.(none):/home/brian/mysql/partition-5.1


BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
parents 824c6cf9 0fd933e4

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"

VC++Files/mysys/mysys.dsp

+4 −0
Original line number Diff line number Diff line
@@ -317,6 +317,10 @@ SOURCE=.\mf_tempfile.c 
# End Source File

# Begin Source File



SOURCE=.\mf_unixpath.c

# End Source File

# Begin Source File



SOURCE=.\mf_wcomp.c

# End Source File

# Begin Source File

client/mysqltest.c

+647 −347

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+7 −0
Original line number Diff line number Diff line
@@ -1958,6 +1958,13 @@ AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style, 
AC_LANG_SAVE

AC_LANG_CPLUSPLUS



# Test whether madvise() is declared in C++ code -- it is not on some

# systems, such as Solaris

AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H

#include <sys/types.h>

#include <sys/mman.h>

#endif])



# Do not treat warnings as errors if we are linking against other libc

# this is to work around gcc not being permissive on non-system includes

# with respect to ANSI C++