Skip to content

Commit 620b7ba

Browse files
author
[email protected]
committed
Merge
2 parents 418808b + 3af12c4 commit 620b7ba

449 files changed

Lines changed: 13165 additions & 6193 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: 798 additions & 384 deletions
Large diffs are not rendered by default.

‎BUILD/SETUP.sh‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ prefix_configs="--prefix=/usr/local/mysql"
1010
just_print=
1111
just_configure=
1212
full_debug=
13+
if test -n "$MYSQL_BUILD_PREFIX"
14+
then
15+
prefix_configs="--prefix=$MYSQL_BUILD_PREFIX"
16+
fi
17+
1318
while test $# -gt 0
1419
do
1520
case "$1" in
@@ -47,10 +52,11 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
4752
#debug_extra_warnings="-Wuninitialized"
4853
c_warnings="$global_warnings -Wunused"
4954
cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
50-
51-
base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-partition"
52-
max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables --with-partition"
55+
base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition"
56+
base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"
57+
max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables --with-partition"
5358
max_configs="$base_max_configs --with-embedded-server"
59+
max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"
5460

5561
path=`dirname $0`
5662
. "$path/check-cpu"

‎BUILD/autorun.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ aclocal || die "Can't execute aclocal"
77
autoheader || die "Can't execute autoheader"
88
# --force means overwrite ltmain.sh script if it already exists
99
# Added glibtoolize reference to make native OSX autotools work
10-
if [ -f /usr/bin/glibtoolize ] ; then
10+
if test -f /usr/bin/glibtoolize ; then
1111
glibtoolize --automake --force || die "Can't execute glibtoolize"
1212
else
1313
libtoolize --automake --force || die "Can't execute libtoolize"

‎BUILD/compile-pentium-debug-max-no-ndb‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#! /bin/sh
2+
3+
path=`dirname $0`
4+
. "$path/SETUP.sh" $@ --with-debug=full
5+
6+
extra_flags="$pentium_cflags $debug_cflags $max_cflags"
7+
c_warnings="$c_warnings $debug_extra_warnings"
8+
cxx_warnings="$cxx_warnings $debug_extra_warnings"
9+
extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs"
10+
11+
. "$path/FINISH.sh"

‎BUILD/compile-ppc-debug-max-no-ndb‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#! /bin/sh
2+
3+
path=`dirname $0`
4+
. "$path/SETUP.sh"
5+
6+
extra_flags="$ppc_cflags $debug_cflags $max_cflags"
7+
c_warnings="$c_warnings $debug_extra_warnings"
8+
cxx_warnings="$cxx_warnings $debug_extra_warnings"
9+
extra_configs="$debug_configs $max_no_ndb_configs"
10+
11+
. "$path/FINISH.sh"

‎Makefile.am‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,26 @@ MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \
109109
--master_port=$(MYSQL_TEST_MASTER_PORT) \
110110
--slave_port=$(MYSQL_TEST_SLAVE_PORT) \
111111
--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)
112+
112113
test:
113114
cd mysql-test ; \
114-
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \
115-
./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS)
115+
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) && \
116+
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol
116117

117118
test-force:
118119
cd mysql-test ; \
119-
./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \
120-
./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS)
120+
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --force ; \
121+
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force
122+
123+
test-pl:
124+
cd mysql-test ; \
125+
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \
126+
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol
127+
128+
test-force-pl:
129+
cd mysql-test ; \
130+
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --force ; \
131+
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force
121132

122133
# Don't update the files from bitkeeper
123134
%::SCCS/s.%

VC++Files/storage/bdb/bdb.vcproj renamed to VC++Files/bdb/bdb.vcproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
ProjectType="Visual C++"
44
Version="7.10"
55
Name="bdb"
6-
ProjectGUID="{FB168572-FFF4-4503-9331-4E958459DC9D}"
76
SccProjectName=""
87
SccLocalPath="">
98
<Platforms>

‎VC++Files/client/mysql.vcproj‎

100755100644
File mode changed.

‎VC++Files/client/mysqladmin.vcproj‎

100755100644
File mode changed.

‎VC++Files/client/mysqlclient.vcproj‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)