Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
17e87da2
Commit
17e87da2
authored
Oct 04, 2005
by
jani@ua141d10.elisa.omakaista.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some fixes including implicit declaration of a function,
using wrong type in assignment etc.
parent
fa2bbce5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
3 deletions
+33
-3
cmd-line-utils/readline/complete.c
cmd-line-utils/readline/complete.c
+10
-0
cmd-line-utils/readline/display.c
cmd-line-utils/readline/display.c
+9
-0
cmd-line-utils/readline/mbutil.c
cmd-line-utils/readline/mbutil.c
+10
-0
server-tools/instance-manager/protocol.cc
server-tools/instance-manager/protocol.cc
+2
-3
sql/log.cc
sql/log.cc
+2
-0
No files found.
cmd-line-utils/readline/complete.c
View file @
17e87da2
...
@@ -24,6 +24,12 @@
...
@@ -24,6 +24,12 @@
#include "config_readline.h"
#include "config_readline.h"
#include <sys/types.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 <fcntl.h>
#if defined (HAVE_SYS_FILE_H)
#if defined (HAVE_SYS_FILE_H)
...
@@ -56,6 +62,10 @@ extern int errno;
...
@@ -56,6 +62,10 @@ extern int errno;
#include "rldefs.h"
#include "rldefs.h"
#include "rlmbutil.h"
#include "rlmbutil.h"
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
/* Some standard library routines. */
/* Some standard library routines. */
#include "readline.h"
#include "readline.h"
#include "xmalloc.h"
#include "xmalloc.h"
...
...
cmd-line-utils/readline/display.c
View file @
17e87da2
...
@@ -25,6 +25,11 @@
...
@@ -25,6 +25,11 @@
#include <sys/types.h>
#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)
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
# include <unistd.h>
#endif
/* HAVE_UNISTD_H */
#endif
/* HAVE_UNISTD_H */
...
@@ -43,6 +48,10 @@
...
@@ -43,6 +48,10 @@
#include "rldefs.h"
#include "rldefs.h"
#include "rlmbutil.h"
#include "rlmbutil.h"
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
/* Termcap library stuff. */
/* Termcap library stuff. */
#include "tcap.h"
#include "tcap.h"
...
...
cmd-line-utils/readline/mbutil.c
View file @
17e87da2
...
@@ -24,6 +24,12 @@
...
@@ -24,6 +24,12 @@
#include "config_readline.h"
#include "config_readline.h"
#include <sys/types.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 <fcntl.h>
#include "posixjmp.h"
#include "posixjmp.h"
...
@@ -44,6 +50,10 @@
...
@@ -44,6 +50,10 @@
#include "rldefs.h"
#include "rldefs.h"
#include "rlmbutil.h"
#include "rlmbutil.h"
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
#if defined (TIOCSTAT_IN_SYS_IOCTL)
#if defined (TIOCSTAT_IN_SYS_IOCTL)
# include <sys/ioctl.h>
# include <sys/ioctl.h>
#endif
/* TIOCSTAT_IN_SYS_IOCTL */
#endif
/* TIOCSTAT_IN_SYS_IOCTL */
...
...
server-tools/instance-manager/protocol.cc
View file @
17e87da2
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
static
char
eof_buff
[
1
]
=
{
(
char
)
254
};
/* Marker for end of fields */
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
,
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)
...
@@ -74,7 +75,6 @@ int net_send_error(struct st_net *net, uint sql_errno)
MYSQL_ERRMSG_SIZE
];
// message
MYSQL_ERRMSG_SIZE
];
// message
char
*
pos
=
buff
;
char
*
pos
=
buff
;
const
int
ERROR_PACKET_CODE
=
255
;
*
pos
++=
ERROR_PACKET_CODE
;
*
pos
++=
ERROR_PACKET_CODE
;
int2store
(
pos
,
sql_errno
);
int2store
(
pos
,
sql_errno
);
pos
+=
2
;
pos
+=
2
;
...
@@ -95,7 +95,6 @@ int net_send_error_323(struct st_net *net, uint sql_errno)
...
@@ -95,7 +95,6 @@ int net_send_error_323(struct st_net *net, uint sql_errno)
MYSQL_ERRMSG_SIZE
];
// message
MYSQL_ERRMSG_SIZE
];
// message
char
*
pos
=
buff
;
char
*
pos
=
buff
;
const
int
ERROR_PACKET_CODE
=
255
;
*
pos
++=
ERROR_PACKET_CODE
;
*
pos
++=
ERROR_PACKET_CODE
;
int2store
(
pos
,
sql_errno
);
int2store
(
pos
,
sql_errno
);
pos
+=
2
;
pos
+=
2
;
...
@@ -195,7 +194,7 @@ int send_fields(struct st_net *net, LIST *fields)
...
@@ -195,7 +194,7 @@ int send_fields(struct st_net *net, LIST *fields)
int2store
(
send_buff
.
buffer
+
position
,
1
);
/* charsetnr */
int2store
(
send_buff
.
buffer
+
position
,
1
);
/* charsetnr */
int4store
(
send_buff
.
buffer
+
position
+
2
,
int4store
(
send_buff
.
buffer
+
position
+
2
,
field
->
length
);
/* field length */
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 */
int2store
(
send_buff
.
buffer
+
position
+
7
,
0
);
/* flags */
send_buff
.
buffer
[
position
+
9
]
=
(
char
)
0
;
/* decimals */
send_buff
.
buffer
[
position
+
9
]
=
(
char
)
0
;
/* decimals */
send_buff
.
buffer
[
position
+
10
]
=
0
;
send_buff
.
buffer
[
position
+
10
]
=
0
;
...
...
sql/log.cc
View file @
17e87da2
...
@@ -1850,7 +1850,9 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event)
...
@@ -1850,7 +1850,9 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event)
if
(
commit_event
->
write
(
&
log_file
))
if
(
commit_event
->
write
(
&
log_file
))
goto
err
;
goto
err
;
#ifndef DBUG_OFF
DBUG_skip_commit:
DBUG_skip_commit:
#endif
if
(
flush_and_sync
())
if
(
flush_and_sync
())
goto
err
;
goto
err
;
DBUG_EXECUTE_IF
(
"half_binlogged_transaction"
,
abort
(););
DBUG_EXECUTE_IF
(
"half_binlogged_transaction"
,
abort
(););
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment