Commit c1b29d29 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents b2242973 8b5d5c2c

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -403,8 +403,10 @@ heap/hp_test2 
help

help.c

help.h

include/check_abi

include/my_config.h

include/my_global.h

include/mysql_h.ic

include/mysql_version.h

include/mysqld_ername.h

include/mysqld_error.h
@@ -704,6 +706,7 @@ mysql-test/r/bdb-deadlock.err 
mysql-test/r/bdb.err

mysql-test/r/bdb.log

mysql-test/r/bdb_cache.err

mysql-test/r/blackhole.log

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

client/mysql.cc

+5 −1
Original line number Diff line number Diff line
@@ -2934,7 +2934,11 @@ com_connect(String *buffer, char *line) 
  bzero(buff, sizeof(buff));

  if (buffer)

  {

    strmake(buff, line, sizeof(buff) - 1);

    /*

      Two null bytes are needed in the end of buff to allow

      get_arg to find end of string the second time it's called.

    */

    strmake(buff, line, sizeof(buff)-2);

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg, const char* send, 
                          const char* first_attribute_name, ...)

{

  va_list arg_list;

  char *attribute_name, *attribute_value;

  const char *attribute_name, *attribute_value;



  fputs(sbeg, xml_file);

  fputc('<', xml_file);
@@ -1318,7 +1318,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name, 
static void print_blob_as_hex(FILE *output_file, const char *str, ulong len)

{

    /* sakaik got the idea to to provide blob's in hex notation. */

    char *ptr= str, *end= ptr + len;

    const char *ptr= str, *end= ptr + len;

    for (; ptr < end ; ptr++)

      fprintf(output_file, "%02X", *((uchar *)ptr));

    check_io(output_file);

client/mysqltest.c

+4 −4
Original line number Diff line number Diff line
@@ -398,13 +398,13 @@ TYPELIB command_typelib= {array_elements(command_names),"", 
DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages;



void die(const char *fmt, ...)

  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;

  ATTRIBUTE_FORMAT(printf, 1, 2);

void abort_not_supported_test(const char *fmt, ...)

  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;

  ATTRIBUTE_FORMAT(printf, 1, 2);

void verbose_msg(const char *fmt, ...)

  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;

  ATTRIBUTE_FORMAT(printf, 1, 2);

void warning_msg(const char *fmt, ...)

  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;

  ATTRIBUTE_FORMAT(printf, 1, 2);



VAR* var_from_env(const char *, const char *);

VAR* var_init(VAR* v, const char *name, int name_len, const char *val,

configure.in

+10 −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.27)

AM_INIT_AUTOMAKE(mysql, 5.0.29)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=27

NDB_VERSION_BUILD=29

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -449,6 +449,10 @@ AC_SUBST(DOXYGEN) 
AC_SUBST(PDFLATEX)

AC_SUBST(MAKEINDEX)



# icheck, used for ABI check

AC_PATH_PROG(ICHECK, icheck, no)

AC_SUBST(ICHECK)



# Lock for PS

AC_PATH_PROG(PS, ps, ps)

AC_MSG_CHECKING("how to check if pid exists")
@@ -1176,12 +1180,16 @@ EOF 
          cat > $filesed << EOF

s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,

s,\(: conf_to_src\),\1.linux,

s,libyassl.la,.libs/libyassl.a,

s,libtaocrypt.la,.libs/libtaocrypt.a,

EOF

          ;;

        libmysql_r/Makefile.in)

          cat > $filesed << EOF

s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,

s,\(: conf_to_src\),\1.linux,

s,libyassl.la,.libs/libyassl.a,

s,libtaocrypt.la,.libs/libtaocrypt.a,

EOF

          ;;

        strings/Makefile.in)