Skip to content

Commit b4696db

Browse files
author
Jon Olav Hauglid
committed
manual merge from mysql-trunk-bugfixing
Conflicts: Text conflict in mysql-test/r/archive.result Contents conflict in mysql-test/r/innodb_bug38231.result Text conflict in mysql-test/r/mdl_sync.result Text conflict in mysql-test/suite/binlog/t/disabled.def Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result Text conflict in mysql-test/t/archive.test Contents conflict in mysql-test/t/innodb_bug38231.test Text conflict in mysql-test/t/mdl_sync.test Text conflict in sql/sp_head.cc Text conflict in sql/sql_show.cc Text conflict in sql/table.cc Text conflict in sql/table.h --BZR-- revision-id: [email protected] property-branch-nick: mysql-trunk-runtime-merge testament3-sha1: c7bb673a322cfc0a916a52e6fa5a83aa3ba60caa
2 parents b82a09c + 0ab6f21 commit b4696db

File tree

870 files changed

+29383
-26100
lines changed

Some content is hidden

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

870 files changed

+29383
-26100
lines changed

‎.bzrfileids‎

8.27 KB
Binary file not shown.

‎.bzrignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3091,3 +3091,13 @@ client/dtoa.c
30913091
libmysqld/sql_audit.cc
30923092
configure.am
30933093
libmysqld/des_key_file.cc
3094+
CPackConfig.cmake
3095+
CPackSourceConfig.cmake
3096+
make_dist.cmake
3097+
client/echo
3098+
libmysql/libmysql_exports_file.cc
3099+
libmysql/merge_archives_mysqlclient.cmake
3100+
libmysqld/merge_archives_mysqlserver.cmake
3101+
libmysqld/mysqlserver_depends.c
3102+
libmysqld/examples/mysql_embedded
3103+
sql/.empty

‎BUILD/Makefile.am‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ EXTRA_DIST = FINISH.sh \
2525
check-cpu \
2626
cleanup \
2727
compile-alpha \
28-
compile-alpha-ccc \
29-
compile-alpha-cxx \
3028
compile-alpha-debug \
3129
compile-amd64-debug-max \
3230
compile-amd64-debug-max-no-ndb \
@@ -78,6 +76,3 @@ EXTRA_DIST = FINISH.sh \
7876
compile-solaris-sparc-debug \
7977
compile-solaris-sparc-forte \
8078
compile-solaris-sparc-purify
81-
82-
# Don't update the files from bitkeeper
83-
%::SCCS/s.%

‎BUILD/SETUP.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,12 @@ fi
119119

120120
# Set flags for various build configurations.
121121
# Used in -valgrind builds
122-
valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify "
122+
# Override -DFORCE_INIT_OF_VARS from debug_cflags. It enables the macro
123+
# LINT_INIT(), which is only useful for silencing spurious warnings
124+
# of static analysis tools. We want LINT_INIT() to be a no-op in Valgrind.
125+
valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify "
123126
valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max"
127+
valgrind_configs="--with-valgrind"
124128
#
125129
# Used in -debug builds
126130
debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "

‎BUILD/build_mccge.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,9 +1010,10 @@ set_ccache_usage()
10101010
set_valgrind_flags()
10111011
{
10121012
if test "x$valgrind_flag" = "xyes" ; then
1013-
loc_valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify "
1013+
loc_valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify "
10141014
loc_valgrind_flags="$loc_valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max"
10151015
compiler_flags="$compiler_flags $loc_valgrind_flags"
1016+
with_flags="$with_flags --with-valgrind"
10161017
fi
10171018
}
10181019

‎BUILD/compile-alpha-ccc‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎BUILD/compile-alpha-cxx‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎BUILD/compile-amd64-valgrind-max‎

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

66
extra_flags="$amd64_cflags $debug_cflags $valgrind_flags"
7-
extra_configs="$amd64_configs $debug_configs $max_configs"
7+
extra_configs="$amd64_configs $debug_configs $valgrind_configs $max_configs"
88

99
. "$path/FINISH.sh"
1010

‎BUILD/compile-pentium-icc-valgrind-max‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
2929
c_warnings="-Wall -Wcheck -wd161,444,279,810,981,1292,1469,1572"
3030
cxx_warnings="$c_warnings -wd869,874"
3131
base_cxxflags="-fno-exceptions -fno-rtti"
32-
extra_configs="$pentium_configs $debug_configs"
32+
extra_configs="$pentium_configs $debug_configs $valgrind_configs"
3333

3434
. "$path/FINISH.sh"

‎BUILD/compile-pentium-valgrind-max‎

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

66
extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
7-
extra_configs="$pentium_configs $debug_configs $max_configs"
7+
extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs"
88

99
. "$path/FINISH.sh"
1010

0 commit comments

Comments
 (0)