Commit 98713853 authored by unknown's avatar unknown
Browse files

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20839


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 7c0b76a8 60b5420b

.bzrignore

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

*/*.dir/*

*/*_pure_*warnings

*/.deps

*/.libs/*

*/.pure

*/debug/*

*/release/*
@@ -1240,6 +1242,7 @@ mysql-test/gmon.out 
mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run-shell

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster
@@ -1731,6 +1734,7 @@ netware/.deps/my_manage.Po 
netware/.deps/mysql_install_db.Po

netware/.deps/mysql_test_run.Po

netware/.deps/mysqld_safe.Po

netware/libmysql.imp

pack_isam/*.ds?

perror/*.ds?

perror/*.vcproj

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/collapsed

+5 −0
Original line number Diff line number Diff line
@@ -2,3 +2,8 @@ 
44ec850ac2k4y2Omgr92GiWPBAVKGQ

44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

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