Commit 72c28731 authored by unknown's avatar unknown
Browse files

merge 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/kernel/LogLevel.hpp:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
parents b181f610 4630d406

.bzrignore

+22 −0
Original line number Diff line number Diff line
@@ -924,3 +924,25 @@ Docs/Images/mydsn.txt 
Docs/Images/myflowchart.txt

mysql-test/mysql_test_run_new

ndb/tools/ndb_test_platform

help

ndbcluster-1186

ndbcluster-1186/SCCS

ndbcluster-1186/config.ini

ndbcluster-1186/ndb_1.pid

ndbcluster-1186/ndb_1_out.log

ndbcluster-1186/ndb_1_signal.log

ndbcluster-1186/ndb_2.pid

ndbcluster-1186/ndb_2_out.log

ndbcluster-1186/ndb_2_signal.log

ndbcluster-1186/ndb_3.pid

ndbcluster-1186/ndb_3_cluster.log

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

analyse.test

client/mysqladmin.c

mysql-4.1.8-win-src.zip

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"