Commit 44b44795 authored by Kristofer Pettersson's avatar Kristofer Pettersson
Browse files

auto merge

parents 71be65dd 504f7e2d

client/mysql.cc

+9 −33
Original line number Diff line number Diff line
@@ -1779,7 +1779,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)
@@ -2081,37 +2081,6 @@ static bool add_line(String &buffer,char *line,char *in_string, 
	continue;

      }

    }

    else if (!*ml_comment && !*in_string &&

             (end_of_line - pos) >= 10 &&

             !my_strnncoll(charset_info, (uchar*) pos, 10,

                           (const uchar*) "delimiter ", 10))

    {

      // Flush previously accepted characters

      if (out != line)

      {

        buffer.append(line, (uint32) (out - line));

        out= line;

      }



      // Flush possible comments in the buffer

      if (!buffer.is_empty())

      {

        if (com_go(&buffer, 0) > 0) // < 0 is not fatal

          DBUG_RETURN(1);

        buffer.length(0);

      }



      /*

        Delimiter wants the get rest of the given line as argument to

        allow one to change ';' to ';;' and back

      */

      buffer.append(pos);

      if (com_delimiter(&buffer, pos) > 0)

        DBUG_RETURN(1);



      buffer.length(0);

      break;

    }

    else if (!*ml_comment && !*in_string && is_prefix(pos, delimiter))

    {

      // Found a statement. Continue parsing after the delimiter
@@ -2156,7 +2125,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)

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.66)

AM_INIT_AUTOMAKE(mysql, 5.0.68)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=66

NDB_VERSION_BUILD=68

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/include/have_archive.inc

+1 −1
Original line number Diff line number Diff line 
--require r/have_archive.require

--disable_query_log

show variables like "have_archive";

show variables like 'have_archive';

--enable_query_log

mysql-test/include/have_bdb.inc

+1 −1
Original line number Diff line number Diff line 
-- require r/have_bdb.require

disable_query_log;

show variables like "have_bdb";

show variables like 'have_bdb';

enable_query_log;

mysql-test/include/have_big5.inc

+1 −1
Original line number Diff line number Diff line 
-- require r/have_big5.require

disable_query_log;

show collation like "big5_chinese_ci";

show collation like 'big5_chinese_ci';

enable_query_log;