Commit 39622e12 authored by unknown's avatar unknown
Browse files

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

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


include/my_global.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
support-files/Makefile.am:
  Auto merged
BUILD/compile-solaris-sparc-forte:
  merged
BUILD/compile-solaris-sparc-purify:
  merged
parents 506af377 1eb71c68

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -2664,6 +2664,7 @@ storage/ndb/src/mgmclient/test_cpcd/*.d 
storage/ndb/src/mgmsrv/ndb_mgmd

storage/ndb/src/mgmsrv/ndb_mgmd.dsp

storage/ndb/src/ndbapi/libndbapi.dsp

storage/ndb/src/ndbapi/ndberror_check

storage/ndb/test/ndbapi/DbAsyncGenerator

storage/ndb/test/ndbapi/DbCreate

storage/ndb/test/ndbapi/bank/bankCreator

BUILD/SETUP.sh.rej

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
***************

*** 39,46 ****

  c_warnings="$global_warnings -Wunused"

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

  

! alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

! pentium_cflags="-mcpu=pentiumpro"

  sparc_cflags=""

  

  # be as fast as we can be without losing our ability to backtrace

--- 39,46 ----

  c_warnings="$global_warnings -Wunused"

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

  

! #alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

! #pentium_cflags="-mcpu=pentiumpro"

  sparc_cflags=""

  

  # be as fast as we can be without losing our ability to backtrace

BUILD/compile-pentium

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

. "$path/SETUP.sh" $@



extra_flags="$pentium_cflags $fast_cflags"

extra_configs="$pentium_configs $static_link"

BUILD/compile-pentium64

+3 −5
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

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

. "$path/SETUP.sh" $@



extra_flags="$pentium64_cflags $fast_cflags"

c_warnings="$c_warnings"

cxx_warnings="$cxx_warnings"

extra_configs="$pentium_configs $static_link"



extra_configs="$extra_configs "

CC="$CC --pipe"

strip=yes



. "$path/FINISH.sh"

BUILD/compile-pentium64-max

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



path=`dirname $0`

. "$path/SETUP.sh" $@



extra_flags="$pentium64_cflags $fast_cflags"

extra_configs="$pentium_configs $max_configs $static_link"

CC="$CC --pipe"

strip=yes



. "$path/FINISH.sh"