Commit 9777809b authored by cmiller@zippy.cornsilk.net's avatar cmiller@zippy.cornsilk.net
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
parents 14394109 e1227564

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1351,3 +1351,5 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

scripts/make_win_src_distribution_old

server-tools/instance-manager/net_serv.cc

BUILD/compile-solaris-amd64

0 → 100755
+55 −0
Original line number Diff line number Diff line 
#!/usr/bin/bash



function _find_mysql_root () (

    while [ "x$PWD" != "x/" ]; do

	# Check if some directories are present

	if [ -d BUILD -a -d sql -a -d mysys ]; then

	    echo "$PWD"

	    return 0

	fi

	cd ..

    done

    return 1

)



make -k clean || true

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

 

path=`dirname $0`

. "$path/autorun.sh"

 

warning_flags="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused"

compiler_flags="-g -O3 -fno-omit-frame-pointer"



export CC CXX CFLAGS CXXFLAGS LDFLAGS LIBS

CC="gcc"

CXX="gcc"

CFLAGS="$warning_flags $compiler_flags"

CXXFLAGS="" 

LDFLAGS="-O3 -g -static-libgcc"

LIBS=-lmtmalloc

root=$(_find_mysql_root)



$root/configure \

    --prefix=/usr/local/mysql \

    --localstatedir=/usr/local/mysql/data \

    --libexecdir=/usr/local/mysql/bin \

    --with-extra-charsets=complex \

    --enable-thread-safe-client \

    --enable-local-infile \

    --with-zlib-dir=bundled \

    --with-big-tables \

    --with-readline \

    --with-archive-storage-engine \

    --with-named-curses=-lcurses \

    --with-big-tables \

    --with-innodb \

    --with-berkeley-db \

    --with-example-storage-engine \

    --with-blackhole-storage-engine \

    --with-ndbcluster \

    --with-federated-storage-engine \

    --with-csv-storage-engine \

    --with-ssl \

    --with-embedded-server \

    --disable-shared

BitKeeper/triggers/post-commit

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



#shift

FROM=$USER@mysql.com

if [ -n "$BK_USER" ]

then

  COMMITTER=$BK_USER

else

  COMMITTER=$USER

fi

FROM=$COMMITTER@mysql.com

COMMITS=commits@lists.mysql.com

DOCS=docs-commit@mysql.com

LIMIT=10000
@@ -88,8 +94,8 @@ Subject: bk commit into $VERSION tree ($CHANGESET)$BS 
X-CSetKey: <$CSETKEY>

$BH

Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

be propagated to the main repository and, within 24 hours after the

$VERSION repository of $COMMITTER.  When $COMMITTER does a push these changes

will be propagated to the main repository and, within 24 hours after the

push, to the public repository.

For information on how to access the public repository

see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
# along with this program; if not, write to the Free Software

# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA



CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)



PROJECT(MySql)



# This reads user configuration, generated by configure.js.

Docs/INSTALL-BINARY

0 → 100644
+8 −0
Original line number Diff line number Diff line 


You can find information about how to install binary distributions at



  http://dev.mysql.com/doc/refman/5.0/en/quick-standard-installation.html



The MySQL Reference Manual is also available in various formats on

http://dev.mysql.com/doc; if you're interested in the DocBook XML

sources go to http://svn.mysql.com.