database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Some fixes including implicit declaration of a function,

Browse Source 
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.
This commit is contained in:
unknown
2005-10-04 18:20:57 +03:00
parent ee6e983c5c
commit dee0ea4b6c
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-line-utils/readline/complete.c
View File

@ -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"

9
cmd-line-utils/readline/display.c
View File

@ -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"

10
cmd-line-utils/readline/mbutil.c
View File

@ -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 */

5
server-tools/instance-manager/protocol.cc
View File

@ -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;

2
sql/log.cc
View File

@ -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(););