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

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
extra/comp_err.c:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mix2_myisam.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
sql/mysqld.cc:
  Manual merge
parents 245b9ad4 793a137d

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -2666,6 +2666,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"