Commit 644bd6e2 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents d38a5d4f 484e89df

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ cmd-line-utils/libedit/makelist 
comon.h

comp_err/*.ds?

comp_err/*.vcproj

compile

config.cache

config.guess

config.h
@@ -553,6 +554,7 @@ libmysqld/spatial.cc 
libmysqld/sql_acl.cc

libmysqld/sql_analyse.cc

libmysqld/sql_base.cc

libmysqld/sql_builtin.cc

libmysqld/sql_cache.cc

libmysqld/sql_class.cc

libmysqld/sql_command
@@ -1179,6 +1181,7 @@ sql/share/gmon.out 
sql/share/mysql

sql/share/norwegian-ny/errmsg.sys

sql/share/norwegian/errmsg.sys

sql/sql_builtin.cc

sql/sql_select.cc.orig

sql/sql_yacc.cc

sql/sql_yacc.h

BUILD/SETUP.sh

+3 −12
Original line number Diff line number Diff line
@@ -147,18 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static" 
local_infile_configs="--enable-local-infile"





max_configs="--with-innodb --with-berkeley-db"

max_configs="$max_configs --with-archive-storage-engine"

max_configs="$max_configs --with-big-tables"

max_configs="$max_configs --with-blackhole-storage-engine"

max_configs="$max_configs --with-federated-storage-engine"

max_configs="$max_configs --with-csv-storage-engine"

max_configs="$max_configs --with-example-storage-engine"

max_configs="$max_configs --with-partition $SSL_LIBRARY"



max_no_embedded_configs="$max_configs --with-ndbcluster"

max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server"

max_configs="$max_configs --with-ndbcluster --with-embedded-server"

max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"

max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server"

max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server"



#

# CPU and platform specific compilation flags.

BUILD/autorun.sh

+5 −2
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 


die() { echo "$@"; exit 1; }



(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)



aclocal || die "Can't execute aclocal" 

autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists
@@ -17,5 +22,3 @@ fi 
# and --force to overwrite them if they already exist

automake --add-missing --force || die "Can't execute automake"

autoconf || die "Can't execute autoconf"
 
(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)

BUILD/compile-dist

+4 −2
Original line number Diff line number Diff line
@@ -7,13 +7,15 @@ 
# package" that is used as the basis for all other binary builds.

#

make distclean

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)

aclocal

autoheader

libtoolize --automake --force --copy

automake --force --add-missing --copy

autoconf

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)



# Default to gcc for CC and CXX

if test -z "$CXX" ; then

Makefile.am

+2 −3
Original line number Diff line number Diff line
@@ -24,12 +24,11 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 
SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_union_dirs@ storage \

			@sql_union_dirs@ storage plugin \

			@sql_server@ scripts @man_dirs@ tests \

			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			mysql-test support-files @tools_dirs@ \

			plugin unittest win

			unittest win



DIST_SUBDIRS =		$(SUBDIRS) BUILD