Commit 56c7e8b3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/ha_ndbcluster_binlog.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents a747e0c3 00959e4d

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
*.vcproj

*/*.dir/*

*/*_pure_*warnings

*/.deps

*/.libs/*

*/.pure

*/debug/*

*/release/*

BUILD/compile-solaris-sparc

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



gmake -k clean || true

/bin/rm -f */.deps/*.P config.cache

 

#!/usr/bin/bash

path=`dirname $0`

. "$path/autorun.sh"



CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client

. "$path/SETUP.sh"

extra_flags=""

extra_configs="$max_configs"



gmake -j 4
 
. "$path/FINISH.sh"

BUILD/compile-solaris-sparc-debug

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



gmake -k clean || true

/bin/rm -f */.deps/*.P config.cache

 

#!/usr/bin/bash

path=`dirname $0`

. "$path/autorun.sh"

 

CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug

. "$path/SETUP.sh"

extra_flags="$debug_cflags"

extra_configs="$debug_configs $max_configs"



gmake -j 4
 
. "$path/FINISH.sh"

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -75,5 +75,6 @@ hours: 
[tomas:]checkout:get

[guilhem:]checkout:get

[pekka:]checkout:get

[msvensson:]checkout:get

checkout:edit

eoln:unix

CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -146,5 +146,7 @@ ADD_SUBDIRECTORY(sql) 
ADD_SUBDIRECTORY(server-tools/instance-manager)

ADD_SUBDIRECTORY(libmysql)

ADD_SUBDIRECTORY(tests)

ADD_SUBDIRECTORY(libmysqld)

ADD_SUBDIRECTORY(libmysqld/examples)
 


# disable libmysqld until it's fixed, so we can use Cmake 2.2 and 2.4

#ADD_SUBDIRECTORY(libmysqld)

#ADD_SUBDIRECTORY(libmysqld/examples)