Skip to content

Commit ce14578

Browse files
author
monty@mysql.com
committed
Merge with 4.0.18
2 parents 0c6a0b9 + efb134f commit ce14578

File tree

229 files changed

+6995
-3728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+6995
-3728
lines changed

.bzrignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Docs/safe-mysql.xml
7474
Docs/tex.fmt
7575
Docs/texi2dvi.out
7676
INSTALL-SOURCE
77+
INSTALL-WIN-SOURCE
7778
Logs/*
7879
MIRRORS
7980
Makefile
@@ -436,6 +437,7 @@ linked_libmysqldex_sources
436437
linked_server_sources
437438
linked_tools_sources
438439
locked
440+
man/*.1
439441
mit-pthreads/config.flags
440442
mit-pthreads/include/bits
441443
mit-pthreads/include/pthread/machdep.h
@@ -458,6 +460,7 @@ myisam/mi_test2
458460
myisam/mi_test3
459461
myisam/mi_test_all
460462
myisam/myisam.log
463+
myisam/myisam_ftdump
461464
myisam/myisamchk
462465
myisam/myisamlog
463466
myisam/myisampack
@@ -640,4 +643,3 @@ vio/test-ssl
640643
vio/test-sslclient
641644
vio/test-sslserver
642645
vio/viotest-ssl
643-
INSTALL-WIN-SOURCE

BUILD/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ EXTRA_DIST = FINISH.sh \
3737
compile-pentium-pgcc \
3838
compile-solaris-sparc \
3939
compile-solaris-sparc-debug \
40+
compile-irix-mips64-mipspro \
4041
compile-solaris-sparc-forte \
4142
compile-solaris-sparc-purify
4243

BUILD/compile-irix-mips64-mipspro

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#!/bin/sh
2+
3+
if [ ! -f "sql/mysqld.cc" ]; then
4+
echo "You must run this script from the MySQL top-level directory."
5+
exit 1
6+
fi
7+
8+
cflags="-64 -mips4"
9+
10+
if [ "$#" != 0 ]; then
11+
case "$1" in
12+
--help)
13+
echo "Usage: $0 [options]"
14+
echo "Options:"
15+
echo "--help print this message"
16+
echo "-32 build 32-bit binary"
17+
echo "-64 build 64-bit binary [default]"
18+
exit 0
19+
;;
20+
-64)
21+
echo "Building 64-bit binary"
22+
;;
23+
-32)
24+
echo "Building 32-bit binary"
25+
cflags=""
26+
;;
27+
*)
28+
echo "$0: invalid option '$1'; use --help to show usage"
29+
exit 1
30+
;;
31+
esac
32+
else
33+
echo "Building 64-bit binary"
34+
fi
35+
36+
set -x
37+
make distclean
38+
aclocal
39+
autoheader
40+
libtoolize --automake --force
41+
automake --force --add-missing
42+
autoconf
43+
44+
(cd bdb/dist && sh s_all)
45+
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
46+
47+
# C options:
48+
# -apo - auto-parallize for multiprocessors (implies -mp)
49+
# -mp - generate multiprocessor code
50+
# These two common optimization options apparently use 'sproc' model of
51+
# threading, which is not compatible with PTHREADS: don't add them unless you
52+
# know what you're doing.
53+
#
54+
# -c99 - enable C features standardized in C99, such as long long,
55+
# strtoll, stroull etc.
56+
# This option is vital to compile MySQL.
57+
# -woff - turn off some warnings
58+
# -64 - generate 64 bit object (implies -mips4)
59+
# -mips4 - produce code for MIPS R10000, MIPS R12000 and further 64 bit
60+
# processors
61+
# -OPT:Olimit=0 - no limits exists to size of function for compiler to optimize
62+
# it
63+
nowarn="-woff 1064,1188,1460,1552,1681,1682,3303"
64+
cflags="$cflags $nowarn -O3 -c99 -OPT:Olimit=0"
65+
66+
# C++ only options:
67+
# -LANG:exceptions=OFF - don't generate exception handling code
68+
# MySQL doesn't use exceptions.
69+
# -LANG:std=OFF - don't link standard C++ library, such as
70+
# <iostream>, <complex>, etc.
71+
# -LANG:libc_in_namespace_std=OFF - libstdc functions can be
72+
# declared in namespace 'std', when included
73+
# into C++ code. Switch this feature off.
74+
# This option is vital to compile MySQL
75+
76+
cxxflags="$cflags -LANG:exceptions=OFF -LANG:std=OFF"
77+
cxxflags="$cxxflags -LANG:libc_in_namespace_std=OFF"
78+
79+
CC=cc CXX=CC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \
80+
./configure --prefix=/usr/local/mysql --disable-shared \
81+
--with-extra-charsets=complex --enable-thread-safe-client \
82+
--without-extra-tools --disable-dependency-tracking
83+
84+
make

BUILD/compile-pentium-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ extra_configs="$pentium_configs"
99

1010
extra_configs="$extra_configs --with-innodb --with-berkeley-db \
1111
--with-embedded-server --enable-thread-safe-client \
12-
--with-openssl --with-vio"
12+
--with-openssl --with-vio --with-raid"
1313

1414
. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ root@x3.internalnet
117117
salle@banica.(none)
118118
salle@geopard.(none)
119119
salle@geopard.online.bg
120+
salle@vafla.home
120121
salle@vafla.online.bg
121122
sasha@mysql.sashanet.com
122123
serg@build.mysql2.com

Build-tools/Bootstrap

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ if (defined $opt_changelog)
257257
$msg= "Adding $target_dir/ChangeLog";
258258
$msg.= " (down to revision $opt_changelog)" if $opt_changelog ne "";
259259
&logger($msg);
260-
$command= "bk changes -v";
260+
$command= "bk changes -mv";
261261
$command.= " -r" if ($opt_changelog ne "" || $opt_revision);
262262
$command.= $opt_changelog if $opt_changelog ne "";
263263
$command.= ".." if ($opt_changelog ne "" && !$opt_revision);

Build-tools/Do-compile

+5-8
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ if ($opt_stage <= 3)
282282
{
283283
my $flags= "";
284284
log_timestamp();
285-
log_system("rm -fr mysql-3* mysql-4* $pwd/$host/*.tar.gz");
285+
log_system("rm -fr mysql-{3,4,5}* $pwd/$host/mysql*.t*gz");
286286
# No need to add the debug symbols, if the binaries are not stripped (saves space)
287287
unless ($opt_with_debug || $opt_no_strip)
288288
{
@@ -291,7 +291,7 @@ if ($opt_stage <= 3)
291291

292292
$flags.= "--no-strip" if ($opt_no_strip || $opt_with_debug);
293293
check_system("scripts/make_binary_distribution --tmp=$opt_tmp --suffix=$opt_suffix $flags",".tar.gz created");
294-
safe_system("mv mysql*.tar.gz $pwd/$host");
294+
safe_system("mv mysql*.t*gz $pwd/$host");
295295
if (-f "client/.libs/mysqladmin")
296296
{
297297
safe_system("cp client/.libs/mysqladmin $pwd/$host/bin");
@@ -303,11 +303,8 @@ if ($opt_stage <= 3)
303303
safe_system("$make clean") if ($opt_with_small_disk);
304304
}
305305

306-
$tar_file=<$pwd/$host/*.tar.gz>;
307-
if (!defined($tar_file))
308-
{
309-
$tar_file=<$pwd/$host/*.tgz>;
310-
}
306+
$tar_file=<$pwd/$host/mysql*.t*gz>;
307+
abort ("Could not find tarball!") unless ($tar_file);
311308

312309
#
313310
# Unpack the binary distribution
@@ -320,7 +317,7 @@ if ($opt_stage <= 4 && !$opt_no_test)
320317
safe_system("gunzip < $tar_file | $tar xf -");
321318
}
322319

323-
$tar_file =~ /(mysql[^\/]*)\.tar/;
320+
$tar_file =~ /(mysql[^\/]*)\.(tar\.gz|tgz)/;
324321
$ver=$1;
325322
$test_dir="$pwd/$host/test/$ver";
326323
$ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .

Build-tools/Do-rpm

+4-15
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@ if (defined $opt_log)
115115
if (-x "/usr/bin/rpmbuild")
116116
{
117117
$RPM= "/usr/bin/rpmbuild";
118+
$RMSOURCE= "--rmsource --rmspec";
118119
}
119120
else
120121
{
121122
$RPM= "/bin/rpm";
123+
$RMSOURCE= "--rmspec";
122124
}
123125

124126
if ($RPM)
@@ -177,7 +179,7 @@ $ENV{MYSQL_BUILD_CXX}=$opt_cxx if ($opt_cxx);
177179
$command= "$RPM";
178180
$command.= " -v" if ($opt_verbose);
179181
$command.= " -ba";
180-
$command.= " --clean" if $opt_clean;
182+
$command.= " --clean $RMSOURCE" if $opt_clean;
181183
$command.= " $SPECDIR/";
182184
$command.= basename($SPECFILE);
183185
&logger("Building RPM.");
@@ -188,7 +190,7 @@ $command.= basename($SPECFILE);
188190
#
189191
$command= "mv";
190192
$command.= " -v " if ($opt_verbose);
191-
$command.= "$SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
193+
$command.= " $SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
192194
&logger("Moving source RPM to current dir.");
193195
&run_command($command, "Error moving source RPM!");
194196

@@ -198,19 +200,6 @@ $command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION*.$RPMARCH.rpm $PWD";
198200
&logger("Moving binary RPMs to current dir.");
199201
&run_command($command, "Error moving binary RPMs!");
200202

201-
#
202-
# Clean up
203-
#
204-
if ($opt_clean)
205-
{
206-
&logger("Removing spec file and source package");
207-
unless ($opt_dry_run)
208-
{
209-
unlink("$SPECDIR/" . basename($SPECFILE));
210-
unlink("$SOURCEDIR/$SOURCEFILE");
211-
}
212-
}
213-
214203
&logger("SUCCESS: RPM files successfully created.") unless ($opt_dry_run);
215204
exit 0;
216205

Build-tools/Do-win-build

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
#!/usr/bin/perl -w
2+
3+
use Getopt::Long;
4+
5+
$opt_help=0;
6+
$opt_tarball=$opt_builddir="";
7+
8+
GetOptions(
9+
"help",
10+
"tarball=s",
11+
"builddir=s",
12+
) || print_help();
13+
14+
print_help() if ($opt_help);
15+
16+
chomp($MSDEV=`which msdev`);
17+
18+
if (!$opt_builddir) {
19+
$opt_builddir = "/cygdrive/c/mysql-win-build";
20+
}
21+
22+
$opt_tarball =~ /(mysql[^\/]*)-win-src\.tar/;
23+
$mysqlver=$1;
24+
$basedir = "$opt_builddir/$mysqlver";
25+
26+
# Make sure build dir exists
27+
mkdir($opt_builddir);
28+
# Clean out any previous build
29+
system("rm -rf $basedir");
30+
mkdir($basedir);
31+
mkdir("$basedir/tarball");
32+
33+
system("cp $opt_tarball $basedir/tarball");
34+
35+
if (!chdir($basedir))
36+
{
37+
print "Do-win-build error: Could not change to $opt_builddir";
38+
exit 1;
39+
}
40+
41+
mkdir("build");
42+
chdir("build");
43+
44+
system("tar -zxvf ../tarball/$mysqlver-win-src.tar.gz");
45+
46+
chdir($mysqlver);
47+
48+
system("\"$MSDEV\" mysql.dsw /MAKE \"ALL\" /OUT $mysqlver-build.log");
49+
50+
#
51+
# Print a help text message
52+
#
53+
sub print_help
54+
{
55+
print <<EOF;
56+
Usage: Do-compile-win [options] source-tarball
57+
58+
Unpacks a Windows source distribution on the local machine and
59+
compiles it using VC++ 6.0.
60+
61+
This script is intended for Cygwin Perl. You must have a working
62+
MSDEV.EXE in your path for compilation.
63+
64+
65+
Options:
66+
67+
--help
68+
Print this text.
69+
70+
--builddir=<dir>
71+
Set the Cygwin path to build under; the tarball will actually
72+
be moved to <builddir>/mysql-<version>/tarball and extracted under
73+
<builddir>/mysql-<version>/build.
74+
Default: /cygdrive/c/mysql-win-build
75+
76+
--tarball=<file>
77+
Windows source tarball to use for this build. Must be of the form
78+
mysql[com]-x.x.x-win-src.tar.gz (REQUIRED)
79+
80+
EOF
81+
exit 1;
82+
}

0 commit comments

Comments
 (0)