Skip to content

Commit d1c9b39

Browse files
author
Alexander Nozdrin
committed
Manual merge from mysql-next-mr.
Conflicts: - mysql-test/r/subselect4.result (Contents conflict) - mysql-test/t/subselect4.test (Contents conflict) - sql/item_buff.cc
2 parents 8f6a541 + 044b5ce commit d1c9b39

File tree

525 files changed

+234984
-16405
lines changed

Some content is hidden

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

525 files changed

+234984
-16405
lines changed

.bzrignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,6 +2116,7 @@ sql/.libs/udf_example.so.0
21162116
sql/.libs/udf_example.so.0.0.0
21172117
sql/client.c
21182118
sql/Doxyfile
2119+
sql/cscope.out
21192120
sql/f.c
21202121
sql/gen_lex_hash
21212122
sql/gmon.out
@@ -3091,6 +3092,13 @@ libmysqld/sys_vars.cc
30913092
libmysqld/keycaches.cc
30923093
client/dtoa.c
30933094
libmysqld/sql_audit.cc
3095+
storage/archive/archive_performance
3096+
storage/archive/concurrency_test
3097+
libmysql_r/client_settings.h
3098+
libmysqld/scheduler.cc
3099+
libmysqld/sql_connect.cc
3100+
libmysqld/sql_tablespace.cc
3101+
mysql-test/dump.txt
30943102
configure.am
30953103
run_collection*.cmake
30963104
configure.am

BUILD/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ EXTRA_DIST = FINISH.sh \
5252
compile-pentium-icc-yassl \
5353
compile-pentium-max \
5454
compile-pentium-myodbc \
55-
compile-pentium-mysqlfs-debug \
5655
compile-pentium-pgcc \
5756
compile-pentium-valgrind-max \
5857
compile-pentium64 \

BUILD/SETUP.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Usage: $0 [-h|-n] [configure-options]
1414
-h, --help Show this help message.
1515
-n, --just-print Don't actually run any commands; just print them.
1616
-c, --just-configure Stop after running configure.
17-
--with-debug=full Build with full debug.
1817
--warning-mode=[old|pedantic|maintainer]
1918
Influences the debug flags. Old is default.
2019
--prefix=path Build with prefix 'path'.
@@ -30,8 +29,6 @@ parse_options()
3029
case "$1" in
3130
--prefix=*)
3231
prefix=`get_key_value "$1"`;;
33-
--with-debug=full)
34-
full_debug="=full";;
3532
--warning-mode=*)
3633
warning_mode=`get_key_value "$1"`;;
3734
-c | --just-configure)
@@ -60,7 +57,6 @@ fi
6057
prefix="/usr/local/mysql"
6158
just_print=
6259
just_configure=
63-
full_debug=
6460
warning_mode=
6561
maintainer_mode=
6662

@@ -116,7 +112,6 @@ else
116112
cxx_warnings="$warnings -Wno-unused-parameter"
117113
# cxx_warnings="$cxx_warnings -Woverloaded-virtual -Wsign-promo"
118114
cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
119-
# Added unless --with-debug=full
120115
debug_extra_cflags="-O0 -g3 -gdwarf-2"
121116
fi
122117

@@ -141,11 +136,8 @@ base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
141136
# Be as fast as we can be without losing our ability to backtrace.
142137
fast_cflags="-O3 -fno-omit-frame-pointer"
143138

144-
debug_configs="--with-debug$full_debug"
145-
if [ -z "$full_debug" ]
146-
then
147-
debug_cflags="$debug_cflags $debug_extra_cflags"
148-
fi
139+
debug_configs="--with-debug"
140+
debug_cflags="$debug_cflags $debug_extra_cflags"
149141

150142
#
151143
# Configuration options.

BUILD/build_mccge.sh

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ Usage: $0 [options]
148148
--extended-help Show extended help message
149149
--without-debug Build non-debug version
150150
--with-debug Build debug version
151-
--with-debug=full Build with full debug.
152151
--configure-only Stop after running configure.
153152
--use-autotools Start by running autoconf, automake,.. tools
154153
--no-autotools Start from configure
@@ -262,10 +261,6 @@ extended_usage()
262261
This flag prevents the use of GPL libraries which cannot be used
263262
under a commercial license, such as the readline library.
264263
265-
--with-debug[=full]
266-
This option will ensure that the version is built with debug
267-
information enabled; the optimisation level is decreased to -O.
268-
269264
--developer
270265
This option changes a number of things to make the version built
271266
more appropriate to the debugging and testing needs of developers.
@@ -658,11 +653,6 @@ parse_options()
658653
--datadir=*)
659654
datadir=`get_key_value "$1"`
660655
;;
661-
--with-debug=full)
662-
full_debug="=full"
663-
with_debug_flag="yes"
664-
fast_flag="no"
665-
;;
666656
--without-debug)
667657
with_debug_flag="no"
668658
if test "x$fast_flag" != "xyes" ; then
@@ -1044,10 +1034,7 @@ set_warning_flags()
10441034
# C++ warnings
10451035
cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder"
10461036
cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
1047-
# Added unless --with-debug=full
1048-
if test "x$full_debug" = "x" ; then
1049-
compiler_flags="$compiler_flags -Wuninitialized"
1050-
fi
1037+
compiler_flags="$compiler_flags -Wuninitialized"
10511038
elif test "x$warning_mode" = "xpedantic" ; then
10521039
warnings="-W -Wall -ansi -pedantic -Wno-long-long -D_POSIX_SOURCE"
10531040
c_warnings="$warnings"
@@ -1113,7 +1100,7 @@ set_base_configs()
11131100
base_configs="$base_configs --localstatedir=$datadir"
11141101
fi
11151102
if test "x$with_debug_flag" = "xyes" ; then
1116-
base_configs="$base_configs --with-debug$full_debug"
1103+
base_configs="$base_configs --with-debug"
11171104
fi
11181105
base_configs="$base_configs --enable-local-infile"
11191106
base_configs="$base_configs --enable-thread-safe-client"
@@ -1546,7 +1533,6 @@ gpl="yes"
15461533
version_text=
15471534
developer_flag="no"
15481535
just_configure=
1549-
full_debug=
15501536
warning_mode=
15511537
with_flags=
15521538
error_inject_flag=

BUILD/check-cpu

Lines changed: 75 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,79 @@
77
# check_cpu_args : Arguments for GCC compiler settings
88
#
99

10+
check_compiler_cpu_flags () {
11+
# different compiler versions have different option names
12+
# for CPU specific command line options
13+
if test -z "$CC" ; then
14+
cc="gcc";
15+
else
16+
cc=$CC
17+
fi
18+
19+
# check if compiler is gcc and dump its version
20+
cc_verno=`$cc -dumpversion 2>/dev/null`
21+
if test "x$?" = "x0" ; then
22+
set -- `echo $cc_verno | tr '.' ' '`
23+
cc_ver="GCC"
24+
cc_major=$1
25+
cc_minor=$2
26+
cc_patch=$3
27+
cc_comp=`expr $cc_major '*' 100 '+' $cc_minor`
28+
fi
29+
30+
case "$cc_ver--$cc_verno" in
31+
*GCC*)
32+
# different gcc backends (and versions) have different CPU flags
33+
case `gcc -dumpmachine` in
34+
i?86-* | x86_64-*)
35+
if test "$cc_comp" -lt 304 ; then
36+
check_cpu_cflags="-mcpu=${cpu_arg}"
37+
elif test "$cc_comp" -ge 402 ; then
38+
check_cpu_cflags="-mtune=native"
39+
else
40+
check_cpu_cflags="-mtune=${cpu_arg}"
41+
fi
42+
;;
43+
ppc-*)
44+
check_cpu_cflags="-mcpu=${cpu_arg} -mtune=${cpu_arg}"
45+
;;
46+
*)
47+
check_cpu_cflags=""
48+
return
49+
;;
50+
esac
51+
;;
52+
2.95.*)
53+
# GCC 2.95 doesn't expose its name in --version output
54+
check_cpu_cflags="-m${cpu_arg}"
55+
;;
56+
*)
57+
check_cpu_cflags=""
58+
return
59+
;;
60+
esac
61+
62+
# now we check whether the compiler really understands the cpu type
63+
touch __test.c
64+
65+
while [ "$cpu_arg" ] ; do
66+
printf "testing $cpu_arg ... " >&2
67+
68+
# compile check
69+
eval "$cc -c $check_cpu_cflags __test.c" 2>/dev/null
70+
if test "x$?" = "x0" ; then
71+
echo ok >&2
72+
break;
73+
fi
74+
75+
echo failed >&2
76+
check_cpu_cflags=""
77+
break;
78+
done
79+
rm __test.*
80+
return 0
81+
}
82+
1083
check_cpu () {
1184
CPUINFO=/proc/cpuinfo
1285
if test -n "$TEST_CPUINFO" ; then
@@ -179,83 +252,14 @@ check_cpu () {
179252
return
180253
fi
181254

182-
# different compiler versions have different option names
183-
# for CPU specific command line options
184-
if test -z "$CC" ; then
185-
cc="gcc";
186-
else
187-
cc=$CC
255+
if test "x$compiler" = "x" ; then
256+
check_compiler_cpu_flags
188257
fi
189258

190259
if test "x$core2" = "xyes" ; then
191260
cpu_arg="core2"
192261
fi
193262

194-
if test "x$compiler" != "x" ; then
195-
return 0
196-
fi
197-
198-
# check if compiler is gcc and dump its version
199-
cc_verno=`$cc -dumpversion 2>/dev/null`
200-
if test "x$?" = "x0" ; then
201-
set -- `echo $cc_verno | tr '.' ' '`
202-
cc_ver="GCC"
203-
cc_major=$1
204-
cc_minor=$2
205-
cc_patch=$3
206-
cc_comp=`expr $cc_major '*' 100 '+' $cc_minor`
207-
fi
208-
209-
case "$cc_ver--$cc_verno" in
210-
*GCC*)
211-
# different gcc backends (and versions) have different CPU flags
212-
case `gcc -dumpmachine` in
213-
i?86-* | x86_64-*)
214-
if test "$cc_comp" -lt 304 ; then
215-
check_cpu_cflags="-mcpu=${cpu_arg}"
216-
elif test "$cc_comp" -ge 402 ; then
217-
check_cpu_cflags="-mtune=native"
218-
else
219-
check_cpu_cflags="-mtune=${cpu_arg}"
220-
fi
221-
;;
222-
ppc-*)
223-
check_cpu_cflags="-mcpu=${cpu_arg} -mtune=${cpu_arg}"
224-
;;
225-
*)
226-
check_cpu_cflags=""
227-
return
228-
;;
229-
esac
230-
;;
231-
2.95.*)
232-
# GCC 2.95 doesn't expose its name in --version output
233-
check_cpu_cflags="-m${cpu_arg}"
234-
;;
235-
*)
236-
check_cpu_cflags=""
237-
return
238-
;;
239-
esac
240-
241-
# now we check whether the compiler really understands the cpu type
242-
touch __test.c
243-
244-
while [ "$cpu_arg" ] ; do
245-
printf "testing $cpu_arg ... " >&2
246-
247-
# compile check
248-
eval "$cc -c $check_cpu_cflags __test.c" 2>/dev/null
249-
if test "x$?" = "x0" ; then
250-
echo ok >&2
251-
break;
252-
fi
253-
254-
echo failed >&2
255-
check_cpu_cflags=""
256-
break;
257-
done
258-
rm __test.*
259263
return 0
260264
}
261265

BUILD/compile-ndb-autotest

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@ path=`dirname $0`
44
. "$path/SETUP.sh"
55

66
extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags='-DERROR_INSERT'"
7-
if [ "$full_debug" ]
8-
then
9-
extra_flags="$debug_cflags"
10-
c_warnings="$c_warnings $debug_extra_warnings"
11-
cxx_warnings="$cxx_warnings $debug_extra_warnings"
12-
extra_configs="$debug_configs $extra_configs"
13-
else
14-
extra_flags="$fast_cflags"
15-
fi
16-
17-
extra_flags="$extra_flags $max_cflags -g"
7+
extra_flags="$fast_cflags $max_cflags -g"
188

199
. "$path/FINISH.sh"

BUILD/compile-pentium-debug

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#! /bin/sh
22

33
path=`dirname $0`
4-
set -- "$@" --with-debug=full
54
. "$path/SETUP.sh"
65

76
extra_flags="$pentium_cflags $debug_cflags"

BUILD/compile-pentium-debug-max

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#! /bin/sh
22

33
path=`dirname $0`
4-
set -- "$@" --with-debug=full
54
. "$path/SETUP.sh"
65

76
extra_flags="$pentium_cflags $debug_cflags"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#! /bin/sh
22

33
path=`dirname $0`
4-
set -- "$@" --with-debug=full
54
. "$path/SETUP.sh"
65

76
extra_flags="$pentium_cflags $debug_cflags"

BUILD/compile-pentium-debug-openssl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ path=`dirname $0`
66
extra_flags="$pentium_cflags $debug_cflags"
77
extra_configs="$pentium_configs $debug_configs"
88

9-
extra_configs="$extra_configs --with-debug=full --with-ssl=/usr"
9+
extra_configs="$extra_configs --with-debug --with-ssl=/usr"
1010

1111
. "$path/FINISH.sh"

0 commit comments

Comments
 (0)