Commit a320e867 authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

merged 5.1-bugteam into B37548 tree

parents 3468f4b4 88e3906a

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -389,6 +389,9 @@ client/readline.cpp 
client/rpl_constants.h

client/rpl_record_old.cc

client/rpl_record_old.h

client/rpl_tblmap.h

client/rpl_tblmap.cc

client/rpl_utility.h

client/select_test

client/sql_string.cpp

client/ssl_test

BUILD/check-cpu

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ check_cpu () { 
  fi



  cc_ver=`$cc --version | sed 1q`

  cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  cc_verno=`echo $cc_ver | sed -e 's/^.*(GCC)//g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  set -- `echo $cc_verno | tr '.' ' '`

  cc_major=$1

  cc_minor=$2

Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ bin-dist: all 
	$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@



# Remove BK's "SCCS" subdirectories from source distribution

# Create initial database files for Windows installations.

# Create initial database files for Windows installations and check them.

dist-hook:

	rm -rf `find $(distdir) -type d -name SCCS -print`

	mkdir -p $(distdir)/win
@@ -57,6 +57,7 @@ dist-hook: 
		--builddir=$(top_builddir) \

		--datadir=$(distdir)/win/data \

		--srcdir=$(top_srcdir)

	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI



tags:

	support-files/build-tags

client/Makefile.am

+4 −2
Original line number Diff line number Diff line
@@ -88,11 +88,12 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ 


mysqltest_SOURCES=		mysqltest.c

mysqltest_CFLAGS=		-DTHREAD -UUNDEF_THREADS_HACK

mysqltest_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

mysqltest_LDADD =		$(CXXLDFLAGS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a \

				$(top_builddir)/regex/libregex.a

				$(top_builddir)/regex/libregex.a \

				$(CLIENT_THREAD_LIBS)



mysql_upgrade_SOURCES=          mysql_upgrade.c \

                                $(top_srcdir)/mysys/my_getpagesize.c
@@ -103,6 +104,7 @@ DEFS = -DUNDEF_THREADS_HACK \ 
			-DDATADIR="\"$(localstatedir)\""



sql_src=log_event.h mysql_priv.h rpl_constants.h \

	rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \

	log_event.cc my_decimal.h my_decimal.cc \

	log_event_old.h log_event_old.cc \

	rpl_record_old.h rpl_record_old.cc

client/mysql.cc

+9 −2
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ static int read_and_execute(bool interactive) 
        the very beginning of a text file when

        you save the file using "Unicode UTF-8" format.

      */

      if (!line_number &&

      if (line && !line_number &&

           (uchar) line[0] == 0xEF &&

           (uchar) line[1] == 0xBB &&

           (uchar) line[2] == 0xBF)
@@ -2176,7 +2176,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)