Skip to content

Commit 31122ef

Browse files
author
[email protected]
committed
Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
2 parents 32594c9 + 5d71817 commit 31122ef

739 files changed

Lines changed: 39160 additions & 18173 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: 120 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/.pure
1515
*~
1616
.*.swp
17+
./config.h
1718
.defs.mk
1819
.depend
1920
.depend.mk
@@ -77,6 +78,7 @@ Docs/mysql.xml
7778
Docs/safe-mysql.xml
7879
Docs/tex.fmt
7980
Docs/texi2dvi.out
81+
EXCEPTIONS-CLIENT
8082
INSTALL-SOURCE
8183
INSTALL-WIN-SOURCE
8284
Logs/*
@@ -336,6 +338,7 @@ libmysqld/derror.cc
336338
libmysqld/discover.cc
337339
libmysqld/errmsg.c
338340
libmysqld/examples/client_test.c
341+
libmysqld/examples/client_test.cc
339342
libmysqld/examples/completion_hash.cc
340343
libmysqld/examples/completion_hash.h
341344
libmysqld/examples/link_sources
@@ -441,6 +444,7 @@ libmysqld/sql_udf.cc
441444
libmysqld/sql_union.cc
442445
libmysqld/sql_unions.cc
443446
libmysqld/sql_update.cc
447+
libmysqld/sql_view.cc
444448
libmysqld/sql_yacc.cc
445449
libmysqld/stacktrace.c
446450
libmysqld/strfunc.cc
@@ -656,7 +660,71 @@ ndb/lib/libREP_API.so
656660
ndb/lib/libndbclient.so
657661
ndb/lib/libndbclient_extra.so
658662
ndb/src/common/mgmcommon/printConfig/*.d
663+
ndb/src/cw/cpcd/ndb_cpcd
664+
ndb/src/kernel/blocks/backup/restore/ndb_restore
665+
ndb/src/kernel/ndbd
666+
ndb/src/mgmclient/ndb_mgm
659667
ndb/src/mgmclient/test_cpcd/*.d
668+
ndb/src/mgmsrv/ndb_mgmd
669+
ndb/test/ndbapi/bank/bankCreator
670+
ndb/test/ndbapi/bank/bankMakeGL
671+
ndb/test/ndbapi/bank/bankSumAccounts
672+
ndb/test/ndbapi/bank/bankTimer
673+
ndb/test/ndbapi/bank/bankTransactionMaker
674+
ndb/test/ndbapi/bank/bankValidateAllGLs
675+
ndb/test/ndbapi/bank/testBank
676+
ndb/test/ndbapi/create_all_tabs
677+
ndb/test/ndbapi/create_tab
678+
ndb/test/ndbapi/drop_all_tabs
679+
ndb/test/ndbapi/flexAsynch
680+
ndb/test/ndbapi/flexBench
681+
ndb/test/ndbapi/flexHammer
682+
ndb/test/ndbapi/flexTT
683+
ndb/test/ndbapi/testBackup
684+
ndb/test/ndbapi/testBasic
685+
ndb/test/ndbapi/testBasicAsynch
686+
ndb/test/ndbapi/testBlobs
687+
ndb/test/ndbapi/testDataBuffers
688+
ndb/test/ndbapi/testDeadlock
689+
ndb/test/ndbapi/testDict
690+
ndb/test/ndbapi/testIndex
691+
ndb/test/ndbapi/testMgm
692+
ndb/test/ndbapi/testNdbApi
693+
ndb/test/ndbapi/testNodeRestart
694+
ndb/test/ndbapi/testOIBasic
695+
ndb/test/ndbapi/testOperations
696+
ndb/test/ndbapi/testRestartGci
697+
ndb/test/ndbapi/testScan
698+
ndb/test/ndbapi/testScanInterpreter
699+
ndb/test/ndbapi/testScanPerf
700+
ndb/test/ndbapi/testSystemRestart
701+
ndb/test/ndbapi/testTimeout
702+
ndb/test/ndbapi/testTransactions
703+
ndb/test/ndbapi/test_event
704+
ndb/test/run-test/atrt
705+
ndb/test/tools/copy_tab
706+
ndb/test/tools/create_index
707+
ndb/test/tools/hugoCalculator
708+
ndb/test/tools/hugoFill
709+
ndb/test/tools/hugoLoad
710+
ndb/test/tools/hugoLockRecords
711+
ndb/test/tools/hugoPkDelete
712+
ndb/test/tools/hugoPkRead
713+
ndb/test/tools/hugoPkReadRecord
714+
ndb/test/tools/hugoPkUpdate
715+
ndb/test/tools/hugoScanRead
716+
ndb/test/tools/hugoScanUpdate
717+
ndb/test/tools/ndb_cpcc
718+
ndb/test/tools/restart
719+
ndb/test/tools/verify_index
720+
ndb/tools/ndb_delete_all
721+
ndb/tools/ndb_desc
722+
ndb/tools/ndb_drop_index
723+
ndb/tools/ndb_drop_table
724+
ndb/tools/ndb_select_all
725+
ndb/tools/ndb_select_count
726+
ndb/tools/ndb_show_tables
727+
ndb/tools/ndb_waiter
660728
pull.log
661729
regex/re
662730
repl-tests/test-repl-ts/repl-timestamp.master.reject
@@ -773,6 +841,7 @@ support-files/MacOSX/postinstall
773841
support-files/MacOSX/preinstall
774842
support-files/binary-configure
775843
support-files/my-huge.cnf
844+
support-files/my-innodb-heavy-4G.cnf
776845
support-files/my-large.cnf
777846
support-files/my-medium.cnf
778847
support-files/my-small.cnf
@@ -785,6 +854,57 @@ support-files/mysql-log-rotate
785854
support-files/mysql.server
786855
support-files/mysql.spec
787856
tags
857+
test/ndbapi/bank/bankCreator
858+
test/ndbapi/bank/bankMakeGL
859+
test/ndbapi/bank/bankSumAccounts
860+
test/ndbapi/bank/bankTimer
861+
test/ndbapi/bank/bankTransactionMaker
862+
test/ndbapi/bank/bankValidateAllGLs
863+
test/ndbapi/bank/testBank
864+
test/ndbapi/create_all_tabs
865+
test/ndbapi/create_tab
866+
test/ndbapi/drop_all_tabs
867+
test/ndbapi/flexAsynch
868+
test/ndbapi/flexBench
869+
test/ndbapi/flexHammer
870+
test/ndbapi/flexTT
871+
test/ndbapi/testBackup
872+
test/ndbapi/testBasic
873+
test/ndbapi/testBasicAsynch
874+
test/ndbapi/testBlobs
875+
test/ndbapi/testDataBuffers
876+
test/ndbapi/testDeadlock
877+
test/ndbapi/testDict
878+
test/ndbapi/testIndex
879+
test/ndbapi/testMgm
880+
test/ndbapi/testNdbApi
881+
test/ndbapi/testNodeRestart
882+
test/ndbapi/testOIBasic
883+
test/ndbapi/testOperations
884+
test/ndbapi/testRestartGci
885+
test/ndbapi/testScan
886+
test/ndbapi/testScanInterpreter
887+
test/ndbapi/testScanPerf
888+
test/ndbapi/testSystemRestart
889+
test/ndbapi/testTimeout
890+
test/ndbapi/testTransactions
891+
test/ndbapi/test_event
892+
test/run-test/atrt
893+
test/tools/copy_tab
894+
test/tools/create_index
895+
test/tools/hugoCalculator
896+
test/tools/hugoFill
897+
test/tools/hugoLoad
898+
test/tools/hugoLockRecords
899+
test/tools/hugoPkDelete
900+
test/tools/hugoPkRead
901+
test/tools/hugoPkReadRecord
902+
test/tools/hugoPkUpdate
903+
test/tools/hugoScanRead
904+
test/tools/hugoScanUpdate
905+
test/tools/ndb_cpcc
906+
test/tools/restart
907+
test/tools/verify_index
788908
test_xml
789909
tests/client_test
790910
tests/connect_test
@@ -799,5 +919,3 @@ vio/test-ssl
799919
vio/test-sslclient
800920
vio/test-sslserver
801921
vio/viotest-ssl
802-
libmysqld/sql_view.cc
803-
libmysqld/examples/client_test.cc

‎BUILD/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ EXTRA_DIST = FINISH.sh \
3838
compile-solaris-sparc \
3939
compile-solaris-sparc-debug \
4040
compile-irix-mips64-mipspro \
41+
compile-hpux11-parisc2-aCC \
4142
compile-solaris-sparc-forte \
4243
compile-solaris-sparc-purify
4344

‎BUILD/compile-hpux11-parisc2-aCC‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
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+
# -fast Expand into a set of compiler options to result in
9+
# improved application run-time. Options include: +O3,
10+
# +Onolooptransform, +Olibcalls, +FPD, +Oentryschedule,
11+
# +Ofastaccess.
12+
# +O4 Perform level 3 as well as doing link time optimizations.
13+
# Also sends +Oprocelim and +Ofastaccess to the linker
14+
# (see ld(1)).
15+
16+
release_flags="-fast +O3"
17+
18+
# -z Do not bind anything to address zero. This option
19+
# allows runtime detection of null pointers. See the
20+
# note on pointers below.
21+
cflags="-g -z +O0"
22+
cxxflags="-g0 -z +O0"
23+
debug_conigure_options="--with-debug"
24+
25+
while [ "$#" != 0 ]; do
26+
case "$1" in
27+
--help)
28+
echo "Usage: $0 [options]"
29+
echo "Options:"
30+
echo "--help print this message"
31+
echo "--debug build debug binary [default] "
32+
echo "--release build optimised binary"
33+
echo "-32 build 32 bit binary [default]"
34+
echo "-64 build 64 bit binary"
35+
exit 0
36+
;;
37+
--debug)
38+
echo "Building debug binary"
39+
;;
40+
--release)
41+
echo "Building release binary"
42+
cflags="$release_flags"
43+
cxxflags="$release_flags"
44+
debug_configure_options=""
45+
;;
46+
-32)
47+
echo "Building 32-bit binary"
48+
;;
49+
-64)
50+
echo "Building 64-bit binary"
51+
cflags="$cflags +DA2.0W +DD64"
52+
cxxflags="$cxxflags +DA2.0W +DD64"
53+
;;
54+
*)
55+
echo "$0: invalid option '$1'; use --help to show usage"
56+
exit 1
57+
;;
58+
esac
59+
shift
60+
done
61+
62+
63+
set -x
64+
make distclean
65+
aclocal
66+
autoheader
67+
libtoolize --automake --force
68+
automake --force --add-missing
69+
autoconf
70+
71+
(cd bdb/dist && sh s_all)
72+
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
73+
74+
CC=cc CXX=aCC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \
75+
./configure --prefix=/usr/local/mysql --disable-shared \
76+
--with-extra-charsets=complex --enable-thread-safe-client \
77+
--without-extra-tools $debug_configure_options \
78+
--disable-dependency-tracking
79+
80+
gmake

‎BUILD/compile-irix-mips64-mipspro‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ ! -f "sql/mysqld.cc" ]; then
66
fi
77

88
cflags="-64 -mips4"
9-
9+
config_args=
1010
if [ "$#" != 0 ]; then
1111
case "$1" in
1212
--help)
@@ -25,8 +25,7 @@ if [ "$#" != 0 ]; then
2525
cflags=""
2626
;;
2727
*)
28-
echo "$0: invalid option '$1'; use --help to show usage"
29-
exit 1
28+
config_args="$config_args $1"; shift
3029
;;
3130
esac
3231
else
@@ -79,6 +78,7 @@ cxxflags="$cxxflags -LANG:libc_in_namespace_std=OFF"
7978
CC=cc CXX=CC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \
8079
./configure --prefix=/usr/local/mysql --disable-shared \
8180
--with-extra-charsets=complex --enable-thread-safe-client \
82-
--without-extra-tools --disable-dependency-tracking
81+
--without-extra-tools --disable-dependency-tracking \
82+
$config_args
8383

8484
make

‎BUILD/compile-pentium-max‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ extra_flags="$pentium_cflags $fast_cflags -g"
77
extra_configs="$pentium_configs"
88
#strip=yes
99

10-
#extra_configs="$extra_configs --with-innodb --with-berkeley-db \
11-
# --with-embedded-server --enable-thread-safe-client \
12-
# --with-openssl --with-vio --with-raid --with-ndbcluster"
13-
# removed per discussion with Brian and Sanja because it makes Bootstrap
14-
# fail
1510
extra_configs="$extra_configs --with-innodb --with-berkeley-db \
1611
--with-embedded-server --enable-thread-safe-client \
1712
--with-openssl --with-vio --with-raid --with-ndbcluster"

‎BUILD/compile-pentium-valgrind-max‎

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

1111
# We want to test isam when building with valgrind
12-
extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl"
12+
extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"
1313

1414
. "$path/FINISH.sh"
1515

‎BitKeeper/etc/logging_ok‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ hf@genie.(none)
6161
[email protected]
6262
[email protected]
6363
[email protected]
64+
[email protected]
6465
[email protected]
6566
[email protected]
6667
[email protected]
@@ -80,10 +81,12 @@ [email protected]
8081
[email protected]
8182
[email protected]
8283
[email protected]
84+
[email protected]
8385
[email protected]
8486
[email protected]
8587
jplindst@t41.(none)
8688
[email protected]
89+
[email protected]
8790
[email protected]
8891
[email protected]
8992
[email protected]
@@ -94,9 +97,11 @@ miguel@hegel.(none)
9497
[email protected]
9598
[email protected]
9699
[email protected]
100+
[email protected]
97101
miguel@light.
98102
[email protected]
99103
[email protected]
104+
[email protected]
100105
[email protected]
101106
mmatthew@markslaptop.
102107
[email protected]
@@ -127,6 +132,8 @@ mysql@home.(none)
127132
[email protected]
128133
[email protected]
129134
[email protected]
135+
[email protected]
136+
[email protected]
130137
[email protected]
131138
[email protected]
132139
[email protected]
@@ -153,6 +160,7 @@ [email protected]
153160
[email protected]
154161
ram@ram.(none)
155162
[email protected]
163+
[email protected]
156164
root@home.(none)
157165
[email protected]
158166
salle@banica.(none)

0 commit comments

Comments
 (0)