Commit c9f0aaa6 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1


sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 0a24ac9e 67aec82f

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -940,3 +940,6 @@ ndbcluster-1186/ndb_3_out.log 
ndbcluster-1186/ndbcluster.pid

ndb/tools/ndb_restore

ac_available_languages_fragment

libmysqld/ha_archive.cc

libmysqld/ha_example.cc

libmysqld/ha_tina.cc

BUILD/SETUP.sh

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wcto 


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

pentium_cflags="-mcpu=pentiumpro"

ppc_cflags="-mpowerpc -mcpu=powerpc"

sparc_cflags=""



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

BUILD/compile-ppc

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



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$ppc_cflags $fast_cflags"

extra_configs="$static_link"

strip=yes



. "$path/FINISH.sh"

BUILD/compile-ppc-debug

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



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$ppc_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$debug_configs "



extra_configs="$extra_configs"



. "$path/FINISH.sh"

BUILD/compile-ppc-debug-max

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



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$ppc_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"



. "$path/FINISH.sh"