Commit 6892d965 authored by Joerg Bruehe's avatar Joerg Bruehe
Browse files

Merge from main 5.1 to 5.1-build

parents c3b3d621 81e7bd86

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

0 → 100755
+24 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"

extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs"



. "$path/FINISH.sh"



if test -z "$just_print"

then

  set +v +x

  echo "\

******************************************************************************

Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with

--enable-assembler. When Valgrind detects an error involving an assembly

function (for example an uninitialized value used as an argument of an

assembly function), Valgrind will not print the stacktrace and 'valgrind

--gdb-attach=yes' will not work either. If you need a stacktrace in those

cases, you have to run BUILD/compile-pentium-valgrind-max with the

--disable-assembler argument.

******************************************************************************"

fi

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ test-bt: 
	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \

	fi

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --suite=funcs_1

	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	    @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2

	-cd mysql-test ; MTR_BUILD_THREAD=auto \
@@ -190,7 +190,7 @@ test-force-full-pl: test-force-full 


test-ext-funcs:

	cd mysql-test ; \

	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \

	    @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \

	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_2



test-ext-rpl:

client/CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")



# We use the "mysqlclient_notls" library here just as safety, in case

# any of the clients here would go beond the client API and access the

# any of the clients here would go beyond the client API and access the

# Thread Local Storage directly.



SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
@@ -32,9 +32,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c)

TARGET_LINK_LIBRARIES(mysql mysqlclient_notls wsock32)



ADD_EXECUTABLE(mysqltest mysqltest.c ../mysys/my_getsystime.c

               ../mysys/my_copy.c ../mysys/my_mkdir.c)

TARGET_LINK_LIBRARIES(mysqltest mysqlclient_notls regex wsock32)

ADD_EXECUTABLE(mysqltest mysqltest.c)

SET_SOURCE_FILES_PROPERTIES(mysqltest.c PROPERTIES COMPILE_FLAGS "-DTHREADS")

TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys regex wsock32 dbug)



ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)

TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient_notls wsock32)

client/Makefile.am

+7 −5
Original line number Diff line number Diff line
@@ -86,11 +86,13 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ 
				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a



mysqltest_SOURCES=		mysqltest.c \

				$(top_srcdir)/mysys/my_getsystime.c \

				$(top_srcdir)/mysys/my_copy.c \

                                $(top_srcdir)/mysys/my_mkdir.c

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)

mysqltest_SOURCES=		mysqltest.c

mysqltest_CFLAGS=		-DTHREAD -UUNDEF_THREADS_HACK

mysqltest_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a \

				$(top_builddir)/regex/libregex.a



mysql_upgrade_SOURCES=          mysql_upgrade.c \

                                $(top_srcdir)/mysys/my_getpagesize.c

client/mysql.cc

+8 −1
Original line number Diff line number Diff line
@@ -2145,7 +2145,14 @@ static bool add_line(String &buffer,char *line,char *in_string, 
    }

    else if (!*ml_comment && (!*in_string && (inchar == '#' ||

			      inchar == '-' && pos[1] == '-' &&

			      my_isspace(charset_info,pos[2]))))

                              /*

                                The third byte is either whitespace or is the

                                end of the line -- which would occur only

                                because of the user sending newline -- which is

                                itself whitespace and should also match.

                              */

			      (my_isspace(charset_info,pos[2]) ||

                               !pos[2]))))

    {

      // Flush previously accepted characters

      if (out != line)