Commit b075786e authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  maint1.mysql.com:/data/localhome/tsmith/bk/51


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
parents 31959774 5154dd66

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -1208,7 +1208,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);
@@ -1458,7 +1458,7 @@ static uint dump_events_for_db(char *db) 
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

+12 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,18 @@ EOF 
        extra/Makefile.in)

          cat > $filesed << EOF

s,\(extra/comp_err\)\$(EXEEXT),\1.linux,

EOF

          ;;

        libmysql/Makefile.in)

          cat > $filesed << EOF

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

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

EOF

          ;;

        libmysql_r/Makefile.in)

          cat > $filesed << EOF

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

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

EOF

          ;;

        client/Makefile.in)

extra/yassl/testsuite/test.hpp

+4 −1
Original line number Diff line number Diff line
@@ -27,9 +27,12 @@ 
#endif /* _WIN32 */





#if !defined(_SOCKLEN_T) && (defined(_WIN32) || defined(__NETWARE__))

#if !defined(_SOCKLEN_T) && defined(_WIN32)

    typedef int socklen_t;

#endif

#if !defined(_SOCKLEN_T) && defined(__NETWARE__)

    typedef size_t socklen_t;

#endif





// Check type of third arg to accept

include/mysql.h

+0 −6
Original line number Diff line number Diff line
@@ -293,12 +293,6 @@ typedef struct st_mysql 
  /* needed for embedded server - no net buffer to store the 'info' */

  char *info_buffer;

#endif

  /*

    In embedded server it points to the statement that is processed

    in the current query. We store some results directly in statement

    fields then.

  */

  struct st_mysql_stmt *current_stmt;

} MYSQL;



typedef struct st_mysql_res {