Skip to content

Commit 649390a

Browse files
Davi ArnautDavi Arnaut
Davi Arnaut
authored and
Davi Arnaut
committed
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
2 parents 06b8897 + 8df2091 commit 649390a

488 files changed

Lines changed: 12062 additions & 12285 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.

‎.bzr-mysql/default.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[MYSQL]
22
post_commit_to = "[email protected]"
33
post_push_to = "[email protected]"
4-
tree_name = "mysql-trunk"
4+
tree_name = "mysql-trunk-bugfixing"

‎BUILD/SETUP.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ fi
119119
# Override -DFORCE_INIT_OF_VARS from debug_cflags. It enables the macro
120120
# LINT_INIT(), which is only useful for silencing spurious warnings
121121
# of static analysis tools. We want LINT_INIT() to be a no-op in Valgrind.
122-
valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify "
122+
valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify "
123123
valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max"
124124
valgrind_configs="--with-valgrind"
125125
#
126126
# Used in -debug builds
127127
debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "
128-
debug_cflags="$debug_cflags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"
128+
debug_cflags="$debug_cflags -DSAFE_MUTEX"
129129
error_inject="--with-error-inject "
130130
#
131131
# Base C++ flags for all builds

‎BUILD/build_mccge.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ 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"
10161016
with_flags="$with_flags --with-valgrind"
@@ -1066,7 +1066,6 @@ set_with_debug_flags()
10661066
if test "x$with_debug_flag" = "xyes" ; then
10671067
if test "x$developer_flag" = "xyes" ; then
10681068
loc_debug_flags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "
1069-
loc_debug_flags="$loc_debug_flags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC"
10701069
compiler_flags="$compiler_flags $loc_debug_flags"
10711070
fi
10721071
fi

‎BUILD/compile-ia64-debug-max‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ gmake -k maintainer-clean || true
44
path=`dirname $0`
55
. "$path/autorun.sh"
66

7-
CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine
7+
CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine
88
gmake

‎CMakeLists.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ENDIF()
3434
SET(CUSTOM_C_FLAGS $ENV{CFLAGS})
3535

3636
OPTION(WITH_DEBUG "Use dbug/safemutex" OFF)
37-
OPTION(WITH_DEBUG_FULL "Use dbug and safemalloc/safemutex. Slow" OFF)
37+
OPTION(WITH_DEBUG_FULL "Use dbug and safemutex. Slow." OFF)
3838

3939
# Distinguish between community and non-community builds, with the
4040
# default being a community build. This does not impact the feature
@@ -196,14 +196,13 @@ IF(NOT CMAKE_BUILD_TYPE
196196
ENDIF()
197197
ENDIF()
198198

199-
# Add safemalloc and safemutex for debug condifurations, except on Windows
200-
# (C runtime library provides safemalloc functionality and safemutex has never
201-
# worked there)
199+
# Add safemutex for debug configurations, except on Windows
200+
# (safemutex has never worked on Windows)
202201
IF(WITH_DEBUG OR WITH_DEBUG_FULL AND NOT WIN32)
203202
FOREACH(LANG C CXX)
204203
IF(WITH_DEBUG_FULL)
205204
SET(CMAKE_${LANG}_FLAGS_DEBUG
206-
"${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
205+
"${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX")
207206
ELSE()
208207
SET(CMAKE_${LANG}_FLAGS_DEBUG
209208
"${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX")

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
2727
@pstack_dir@ libservices \
2828
@sql_union_dirs@ unittest \
2929
@sql_server@ @man_dirs@ tests \
30-
netware @libmysqld_dirs@ \
30+
@libmysqld_dirs@ \
3131
mysql-test support-files sql-bench \
3232
win \
3333
cmake
@@ -36,7 +36,7 @@ DIST_SUBDIRS = . include Docs zlib \
3636
pstack libservices \
3737
strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \
3838
vio sql man tests \
39-
netware libmysqld \
39+
libmysqld \
4040
mysql-test support-files sql-bench \
4141
win \
4242
cmake \

‎client/client_priv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ enum options_client
6060
OPT_IMPORT_USE_THREADS,
6161
OPT_MYSQL_NUMBER_OF_QUERY,
6262
OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
63-
OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,
63+
OPT_TZ_UTC, OPT_CREATE_SLAP_SCHEMA,
6464
OPT_MYSQLDUMP_SLAVE_APPLY,
6565
OPT_MYSQLDUMP_SLAVE_DATA,
6666
OPT_MYSQLDUMP_INCLUDE_MASTER_HOST_PORT,

‎client/completion_hash.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include <my_global.h>
2424
#include <m_string.h>
25-
#undef SAFEMALLOC // Speed things up
2625
#include <my_sys.h>
2726
#include "completion_hash.h"
2827

@@ -213,7 +212,7 @@ void completion_hash_clean(HashTable *ht)
213212
void completion_hash_free(HashTable *ht)
214213
{
215214
completion_hash_clean(ht);
216-
my_free(ht->arBuckets, MYF(0));
215+
my_free(ht->arBuckets);
217216
}
218217

219218

0 commit comments

Comments
 (0)