Commit ec4e385c authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
parents 7ba7eff0 b2fa7d16

cmd-line-utils/readline/complete.c

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ 
#include "config_readline.h"



#include <sys/types.h>



/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */

#ifndef __USE_XOPEN

#define __USE_XOPEN

#endif



#include <fcntl.h>



#if defined (HAVE_SYS_FILE_H)
@@ -56,6 +62,10 @@ extern int errno; 
#include "rldefs.h"

#include "rlmbutil.h"



#ifdef HAVE_WCHAR_H

#include <wchar.h>

#endif



/* Some standard library routines. */

#include "readline.h"

#include "xmalloc.h"

cmd-line-utils/readline/display.c

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 


#include <sys/types.h>



/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */

#ifndef __USE_XOPEN

#define __USE_XOPEN

#endif



#if defined (HAVE_UNISTD_H)

#  include <unistd.h>

#endif /* HAVE_UNISTD_H */
@@ -43,6 +48,10 @@ 
#include "rldefs.h"

#include "rlmbutil.h"



#ifdef HAVE_WCHAR_H

#include <wchar.h>

#endif



/* Termcap library stuff. */

#include "tcap.h"

cmd-line-utils/readline/mbutil.c

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ 
#include "config_readline.h"



#include <sys/types.h>



/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */

#ifndef __USE_XOPEN

#define __USE_XOPEN

#endif



#include <fcntl.h>

#include "posixjmp.h"
@@ -44,6 +50,10 @@ 
#include "rldefs.h"

#include "rlmbutil.h"



#ifdef HAVE_WCHAR_H

#include <wchar.h>

#endif



#if defined (TIOCSTAT_IN_SYS_IOCTL)

#  include <sys/ioctl.h>

#endif /* TIOCSTAT_IN_SYS_IOCTL */

server-tools/instance-manager/protocol.cc

+2 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 




static char eof_buff[1]= { (char) 254 };        /* Marker for end of fields */

static const char ERROR_PACKET_CODE= (char) 255;





int net_send_ok(struct st_net *net, unsigned long connection_id,
@@ -74,7 +75,6 @@ int net_send_error(struct st_net *net, uint sql_errno) 
            MYSQL_ERRMSG_SIZE];                 // message

  char *pos= buff;



  const int ERROR_PACKET_CODE= 255;

  *pos++= ERROR_PACKET_CODE;

  int2store(pos, sql_errno);

  pos+= 2;
@@ -95,7 +95,6 @@ int net_send_error_323(struct st_net *net, uint sql_errno) 
            MYSQL_ERRMSG_SIZE];                 // message

  char *pos= buff;



  const int ERROR_PACKET_CODE= 255;

  *pos++= ERROR_PACKET_CODE;

  int2store(pos, sql_errno);

  pos+= 2;
@@ -195,7 +194,7 @@ int send_fields(struct st_net *net, LIST *fields) 
    int2store(send_buff.buffer + position, 1);          /* charsetnr */

    int4store(send_buff.buffer + position + 2,

              field->length);                           /* field length */

    send_buff.buffer[position+6]= (uint) FIELD_TYPE_STRING;    /* type */

    send_buff.buffer[position+6]= (char) FIELD_TYPE_STRING;    /* type */

    int2store(send_buff.buffer + position + 7, 0);      /* flags */

    send_buff.buffer[position + 9]= (char) 0;           /* decimals */

    send_buff.buffer[position + 10]= 0;

sql/log.cc

+2 −0
Original line number Diff line number Diff line
@@ -1855,7 +1855,9 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) 


    if (commit_event->write(&log_file))

      goto err;

#ifndef DBUG_OFF

DBUG_skip_commit:

#endif

    if (flush_and_sync())

      goto err;

    DBUG_EXECUTE_IF("half_binlogged_transaction", abort(););