Skip to content

Commit dfd59e2

Browse files
Merge 4.1 -> 5.0.
2 parents 1541f2e + 61fd95d commit dfd59e2

790 files changed

Lines changed: 46720 additions & 108874 deletions

File tree

Some content is hidden

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

.bzrignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ client/thimble
250250
client/thread_test
251251
client_test
252252
cmd-line-utils/libedit/common.h
253+
cmd-line-utils/libedit/makelist
253254
comon.h
254255
config.cache
255256
config.h
@@ -361,6 +362,7 @@ libmysqld/item_func.cc
361362
libmysqld/item_geofunc.cc
362363
libmysqld/item_row.cc
363364
libmysqld/item_strfunc.cc
365+
libmysqld/item_subselect.cc
364366
libmysqld/item_sum.cc
365367
libmysqld/item_timefunc.cc
366368
libmysqld/item_uniq.cc
@@ -402,6 +404,7 @@ libmysqld/sql_command
402404
libmysqld/sql_crypt.cc
403405
libmysqld/sql_db.cc
404406
libmysqld/sql_delete.cc
407+
libmysqld/sql_derived.cc
405408
libmysqld/sql_do.cc
406409
libmysqld/sql_handler.cc
407410
libmysqld/sql_help.cc
@@ -443,6 +446,7 @@ linked_libmysqldex_sources
443446
linked_server_sources
444447
linked_tools_sources
445448
locked
449+
man/*.1
446450
mit-pthreads/config.flags
447451
mit-pthreads/include/bits
448452
mit-pthreads/include/pthread/machdep.h
@@ -465,6 +469,7 @@ myisam/mi_test2
465469
myisam/mi_test3
466470
myisam/mi_test_all
467471
myisam/myisam.log
472+
myisam/myisam_ftdump
468473
myisam/myisamchk
469474
myisam/myisamlog
470475
myisam/myisampack
@@ -496,6 +501,7 @@ mysql-test/std_data/*.pem
496501
mysql-test/var/*
497502
mysql.kdevprj
498503
mysql.proj
504+
mysql_priv.h
499505
mysqld.S
500506
mysqld.sym
501507
mysys/#mf_iocache.c#
@@ -506,6 +512,7 @@ mysys/main.cc
506512
mysys/ste5KbMa
507513
mysys/test_charset
508514
mysys/test_dir
515+
mysys/test_gethwaddr
509516
mysys/test_io_cache
510517
mysys/test_thr_alarm
511518
mysys/test_thr_lock
@@ -524,6 +531,7 @@ scripts/fill_help_tables
524531
scripts/fill_help_tables.sql
525532
scripts/make_binary_distribution
526533
scripts/make_sharedlib_distribution
534+
scripts/make_win_binary_distribution
527535
scripts/make_win_src_distribution
528536
scripts/msql2mysql
529537
scripts/mysql_config
@@ -647,4 +655,3 @@ vio/test-ssl
647655
vio/test-sslclient
648656
vio/test-sslserver
649657
vio/viotest-ssl
650-
mysql_priv.h

BUILD/Makefile.am

Lines changed: 1 addition & 0 deletions
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

Lines changed: 84 additions & 0 deletions
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-debug-max

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
88
cxx_warnings="$cxx_warnings $debug_extra_warnings"
99
extra_configs="$pentium_configs $debug_configs"
1010

11-
extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid"
11+
extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio"
1212

1313
. "$path/FINISH.sh"

BUILD/compile-pentium-max

Lines changed: 1 addition & 1 deletion
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/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ hours:
7171
[arjen:]checkout:get
7272
[nick:]checkout:get
7373
checkout:edit
74+
eoln:unix

BitKeeper/etc/logging_ok

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Administrador@light.
22
Administrator@co3064164-a.
33
44
Administrator@fred.
5+
Greg@greg-laptop.
56
67
78
@@ -10,6 +11,7 @@ [email protected]
1011
1112
1213
14+
1315
1416
1517
@@ -26,6 +28,7 @@ [email protected]
2628
2729
2830
31+
2932
3033
3134
gluh@gluh.(none)
@@ -36,6 +39,7 @@ [email protected]
3639
3740
3841
42+
3943
4044
4145
heikki@rescue.
@@ -47,6 +51,8 @@ [email protected]
4751
hf@genie.(none)
4852
4953
54+
55+
5056
5157
5258
jani@hynda.(none)
@@ -58,8 +64,10 @@ [email protected]
5864
5965
6066
67+
6168
6269
70+
6371
6472
6573
@@ -69,6 +77,7 @@ [email protected]
6977
7078
7179
80+
7281
miguel@hegel.(none)
7382
7483
@@ -94,6 +103,7 @@ [email protected]
94103
95104
96105
106+
97107
mysql@home.(none)
98108
99109
@@ -123,8 +133,10 @@ [email protected]
123133
salle@banica.(none)
124134
salle@geopard.(none)
125135
136+
126137
127138
139+
128140
129141
130142
@@ -146,6 +158,7 @@ [email protected]
146158
147159
148160
161+
ulli@morbus.(none)
149162
150163
151164

BitKeeper/triggers/post-commit

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/sh
22

33
#shift
4-
54
FROM=$USER@mysql.com
65
76
87
LIMIT=10000
9-
REPOV=5.0
8+
VERSION="5.0"
109

1110
if [ "$REAL_EMAIL" = "" ]
1211
then
@@ -21,17 +20,24 @@ if [ "$BK_STATUS" = OK ]
2120
then
2221

2322
CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
23+
BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/ BUG#\1/p'`
2424

25+
if [ "$BUG" = "" ]
26+
then
27+
28+
else
29+
30+
fi
2531
#++
26-
# dev-public@
32+
# dev-public@ / dev-bugs@
2733
#--
2834
echo "Commit successful, notifying developers at $TO"
2935
(
3036
cat <<EOF
31-
List-ID: <bk.mysql-$REPOV>
37+
List-ID: <bk.mysql-$VERSION>
3238
From: $FROM
3339
To: $TO
34-
Subject: bk commit - $REPOV tree ($CHANGESET)
40+
Subject: bk commit - $VERSION tree ($CHANGESET)$BUG
3541
3642
EOF
3743
bk changes -v -r+
@@ -44,13 +50,13 @@ EOF
4450
echo "Notifying internals list at $INTERNALS"
4551
(
4652
cat <<EOF
47-
List-ID: <bk.mysql-$REPOV>
53+
List-ID: <bk.mysql-$VERSION>
4854
From: $FROM
4955
To: $INTERNALS
50-
Subject: bk commit into $REPOV tree ($CHANGESET)
56+
Subject: bk commit into $VERSION tree ($CHANGESET)
5157
5258
Below is the list of changes that have just been committed into a local
53-
$REPOV repository of $USER. When $USER does a push these changes will
59+
$VERSION repository of $USER. When $USER does a push these changes will
5460
be propagated to the main repository and, within 24 hours after the
5561
push, to the public repository.
5662
For information on how to access the public repository
@@ -71,10 +77,10 @@ EOF
7177
echo "Notifying docs list at $DOCS"
7278
(
7379
cat <<EOF
74-
List-ID: <bk.mysql-$REPOV>
80+
List-ID: <bk.mysql-$VERSION>
7581
From: $FROM
7682
To: $DOCS
77-
Subject: bk commit - $REPOV tree (Manual) ($CHANGESET)
83+
Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)
7884
7985
EOF
8086
bk changes -v -r+

BitKeeper/triggers/pre-delta

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
if [ `tail -c1 $BK_FILE` ]
4+
then
5+
echo "File $BK_FILE does not end with a new-line character!"
6+
echo ""
7+
echo "Checkin FAILED!"
8+
echo "Fix the problem and retry."
9+
exit 1
10+
fi
11+

Build-tools/Bootstrap

Lines changed: 1 addition & 1 deletion
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);

0 commit comments

Comments
 (0)