From dee0ea4b6c93ab7550e39293655f1b3b65cc3b7c Mon Sep 17 00:00:00 2001
From: unknown <jani@ua141d10.elisa.omakaista.fi>
Date: Tue, 4 Oct 2005 18:20:57 +0300
Subject: Some fixes including implicit declaration of a function, using wrong
 type in assignment etc.

cmd-line-utils/readline/complete.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
cmd-line-utils/readline/display.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
cmd-line-utils/readline/mbutil.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
server-tools/instance-manager/protocol.cc:
  Fixed some types from int to char. Made ERROR_PACKET_CODE
  static global variable in this file.
sql/log.cc:
  Removed warning of unused goto when not in debug mode.
---
 cmd-line-utils/readline/complete.c        | 10 ++++++++++
 cmd-line-utils/readline/display.c         |  9 +++++++++
 cmd-line-utils/readline/mbutil.c          | 10 ++++++++++
 server-tools/instance-manager/protocol.cc |  5 ++---
 sql/log.cc                                |  2 ++
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c
index 5879100e0a6..393700b51e8 100644
--- a/cmd-line-utils/readline/complete.c
+++ b/cmd-line-utils/readline/complete.c
@@ -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"
diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c
index cab76c0da81..372feeaffea 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -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"
 
diff --git a/cmd-line-utils/readline/mbutil.c b/cmd-line-utils/readline/mbutil.c
index c88e9485f39..5cda8f3732d 100644
--- a/cmd-line-utils/readline/mbutil.c
+++ b/cmd-line-utils/readline/mbutil.c
@@ -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 */
diff --git a/server-tools/instance-manager/protocol.cc b/server-tools/instance-manager/protocol.cc
index e14449746fd..73e07f993ae 100644
--- a/server-tools/instance-manager/protocol.cc
+++ b/server-tools/instance-manager/protocol.cc
@@ -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;
diff --git a/sql/log.cc b/sql/log.cc
index 6e372938752..8d9185a8850 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1850,7 +1850,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(););
-- 
cgit v1.2.1