Commit 31433c98 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents 8ea0ac1a fd81437a

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
.out

.snprj/*

.vimrc

50

=6

BitKeeper/etc/config

BitKeeper/etc/csets
@@ -190,6 +191,7 @@ db-*.*.* 
dbug/user.t

extra/comp_err

extra/my_print_defaults

extra/mysql_install

extra/perror

extra/replace

extra/resolve_stack_dump
@@ -412,6 +414,7 @@ sql/mysqld 
sql/mysqld-purecov

sql/mysqld-purify

sql/mysqld-quantify

sql/new.cc

sql/share/*.sys

sql/share/charsets/gmon.out

sql/share/gmon.out

BUILD/FINISH.sh

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ then 
   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)

fi



CFLAGS=\"$cflags\" CXX=$CXX CXXFLAGS=\"$cxxflags\" $configure"

CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \

$configure"



if [ -z "$just_configure" ]

then

BUILD/Makefile.am

0 → 100644
+45 −0
Original line number Diff line number Diff line 
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

#

# This library is free software; you can redistribute it and/or

# modify it under the terms of the GNU Library General Public

# License as published by the Free Software Foundation; either

# version 2 of the License, or (at your option) any later version.

#

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

# Library General Public License for more details.

#

# You should have received a copy of the GNU Library General Public

# License along with this library; if not, write to the Free

# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



## Process this file with automake to create Makefile.in



EXTRA_DIST =		FINISH.sh \

			SETUP.sh \

			compile-alpha \

			compile-alpha-ccc \

			compile-alpha-cxx \

			compile-alpha-debug \

			compile-ia64-debug-max \

			compile-pentium \

			compile-pentium-debug \

			compile-pentium-debug-max \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-gcov \

			compile-pentium-gprof \

			compile-pentium-max \

			compile-pentium-myodbc \

			compile-pentium-mysqlfs-debug \

			compile-pentium-pgcc \

			compile-pentium-symbols \

			compile-solaris-sparc \

			compile-solaris-sparc-debug \

			compile-solaris-sparc-fortre \

			compile-solaris-sparc-purify



# Don't update the files from bitkeeper

%::SCCS/s.%

BUILD/SETUP.sh

+3 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ fi 


if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1

then

  CXX=c++

  CXX="gcc -DUSE_MYSYS_NEW"

  CXXLDFLAGS="-Wl,--defsym -Wl,__cxa_pure_virtual=0"

else

  CXX=gcc

  CXXLDFLAGS=""

fi

BitKeeper/etc/logging_ok

0 → 100644
+41 −0
Original line number Diff line number Diff line 
Administrator@co3064164-a.

Administrator@co3064164-a.rochd1.qld.optushome.com.au

Administrator@fred.

Miguel@light.local

Sinisa@sinisa.nasamreza.org

ahlentz@co3064164-a.rochd1.qld.optusnet.com.au

arjen@co3064164-a.bitbike.com

davida@isil.mysql.com

heikki@donna.mysql.fi

jani@hynda.mysql.fi

jani@janikt.pp.saunalahti.fi

jcole@abel.spaceapes.com

jcole@main.burghcom.com

jcole@tetra.spaceapes.com

miguel@light.local

monty@bitch.mysql.fi

monty@donna.mysql.fi

monty@hundin.mysql.fi

monty@tik.mysql.fi

monty@tramp.mysql.fi

monty@work.mysql.com

mwagner@evoq.mwagner.org

paul@central.snake.net

paul@teton.kitebird.com

root@x3.internalnet

sasha@mysql.sashanet.com

serg@serg.mysql.com

tfr@sarvik.tfr.cafe.ee

tim@bitch.mysql.fi

tim@black.box

tim@hundin.mysql.fi

tim@threads.polyesthetic.msg

tim@white.box

tim@work.mysql.com

tonu@hundin.mysql.fi

tonu@volk.internalnet

tonu@x153.internalnet

tonu@x3.internalnet

jcole@sarvik.tfr.cafe.ee

venu@work.mysql.com

bell@sanja.is.com.ua