Skip to content

Commit c4ce1c2

Browse files
marcalffmarcalff
committed
Merge mysql-next-mr --> mysql-next-mr-wl4674
2 parents 5d8f4f0 + 44f778e commit c4ce1c2

File tree

756 files changed

+29935
-25628
lines changed

Some content is hidden

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

756 files changed

+29935
-25628
lines changed

‎.bzrignore

+10
Original file line numberDiff line numberDiff line change
@@ -3096,3 +3096,13 @@ make_dist.cmake
30963096
_CPack_Packages
30973097
merge_archives*.cmake
30983098
libmysqld/des_key_file.cc
3099+
CPackConfig.cmake
3100+
CPackSourceConfig.cmake
3101+
make_dist.cmake
3102+
client/echo
3103+
libmysql/libmysql_exports_file.cc
3104+
libmysql/merge_archives_mysqlclient.cmake
3105+
libmysqld/merge_archives_mysqlserver.cmake
3106+
libmysqld/mysqlserver_depends.c
3107+
libmysqld/examples/mysql_embedded
3108+
sql/.empty

‎BUILD/Makefile.am

-2
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 \

‎BUILD/SETUP.sh

+5-1
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

+2-1
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

-41
This file was deleted.

‎BUILD/compile-alpha-cxx

-43
This file was deleted.

‎BUILD/compile-amd64-valgrind-max

+1-1
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

+1-1
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

+1-1
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

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

+1-1
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_no_ndb_configs"
7+
extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_no_ndb_configs"
88

99
. "$path/FINISH.sh"
1010

‎BUILD/compile-pentium64-valgrind-max

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

66
extra_flags="$pentium64_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

‎CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ IF(NOT WITHOUT_SERVER)
263263
ENDIF()
264264

265265
INCLUDE(cmake/abi_check.cmake)
266+
INCLUDE(cmake/tags.cmake)
266267

267268
CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)
268269
CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)

‎client/Makefile.am

+8-6
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ \
5858
mysqladmin_SOURCES = mysqladmin.cc
5959

6060
mysqlbinlog_SOURCES = mysqlbinlog.cc
61-
mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
62-
$(LIBMYSQLCLIENT_LA) @CLIENT_EXTRA_LDFLAGS@ \
63-
$(top_builddir)/mysys/libmysys.a
61+
mysqlbinlog_CXXFLAGS= -DTHREAD -UMYSQL_CLIENT_NO_THREADS
62+
mysqlbinlog_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
63+
@CLIENT_EXTRA_LDFLAGS@ \
64+
$(LIBMYSQLCLIENT_LA) \
65+
$(top_builddir)/mysys/libmysyslt.la
6466

6567
mysqldump_SOURCES= mysqldump.c \
6668
my_user.c \
@@ -71,7 +73,7 @@ mysqlimport_CFLAGS= -DTHREAD -UUNDEF_THREADS_HACK
7173
mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
7274
@CLIENT_EXTRA_LDFLAGS@ \
7375
$(LIBMYSQLCLIENT_LA) \
74-
$(top_builddir)/mysys/libmysys.a
76+
$(top_builddir)/mysys/libmysyslt.la
7577

7678
mysqlshow_SOURCES= mysqlshow.c
7779

@@ -80,14 +82,14 @@ mysqlslap_CFLAGS= -DTHREAD -UMYSQL_CLIENT_NO_THREADS
8082
mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
8183
@CLIENT_EXTRA_LDFLAGS@ \
8284
$(LIBMYSQLCLIENT_LA) \
83-
$(top_builddir)/mysys/libmysys.a
85+
$(top_builddir)/mysys/libmysyslt.la
8486

8587
mysqltest_SOURCES= mysqltest.cc
8688
mysqltest_CXXFLAGS= -DTHREAD -UMYSQL_CLIENT_NO_THREADS
8789
mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
8890
@CLIENT_EXTRA_LDFLAGS@ \
8991
$(LIBMYSQLCLIENT_LA) \
90-
$(top_builddir)/mysys/libmysys.a \
92+
$(top_builddir)/mysys/libmysyslt.la \
9193
$(top_builddir)/regex/libregex.a \
9294
$(CLIENT_THREAD_LIBS)
9395

‎client/mysql.cc

+6-20
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ static char *server_version= NULL;
5959
/* Array of options to pass to libemysqld */
6060
#define MAX_SERVER_ARGS 64
6161

62-
void* sql_alloc(unsigned size); // Don't use mysqld alloc for these
63-
void sql_element_free(void *ptr);
6462
#include "sql_string.h"
6563

6664
extern "C" {
@@ -2318,8 +2316,10 @@ static bool add_line(String &buffer,char *line,char *in_string,
23182316

23192317
#ifdef HAVE_READLINE
23202318

2319+
C_MODE_START
23212320
static char *new_command_generator(const char *text, int);
2322-
extern "C" char **new_mysql_completion (const char *text, int start, int end);
2321+
static char **new_mysql_completion(const char *text, int start, int end);
2322+
C_MODE_END
23232323

23242324
/*
23252325
Tell the GNU Readline library how to complete. We want to try to complete
@@ -2451,9 +2451,9 @@ static void initialize_readline (char *name)
24512451
array of matches, or NULL if there aren't any.
24522452
*/
24532453

2454-
char **new_mysql_completion (const char *text,
2455-
int start __attribute__((unused)),
2456-
int end __attribute__((unused)))
2454+
static char **new_mysql_completion(const char *text,
2455+
int start __attribute__((unused)),
2456+
int end __attribute__((unused)))
24572457
{
24582458
if (!status.batch && !quick)
24592459
#if defined(USE_NEW_READLINE_INTERFACE)
@@ -4963,17 +4963,3 @@ static int com_prompt(String *buffer, char *line)
49634963
tee_fprintf(stdout, "PROMPT set to '%s'\n", current_prompt);
49644964
return 0;
49654965
}
4966-
4967-
#ifndef EMBEDDED_LIBRARY
4968-
/* Keep sql_string library happy */
4969-
4970-
void *sql_alloc(size_t Size)
4971-
{
4972-
return my_malloc(Size,MYF(MY_WME));
4973-
}
4974-
4975-
void sql_element_free(void *ptr)
4976-
{
4977-
my_free(ptr,MYF(0));
4978-
}
4979-
#endif /* EMBEDDED_LIBRARY */

0 commit comments

Comments
 (0)