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
877b2f46
Commit
877b2f46
authored
Mar 07, 2005
by
georg@lmy002.wdf.sap.corp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed conversion errors (Windows IA64 build)
parent
473f2f94
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
client/mysql.cc
client/mysql.cc
+5
-7
client/readline.cc
client/readline.cc
+1
-1
client/sql_string.cc
client/sql_string.cc
+2
-2
No files found.
client/mysql.cc
View file @
877b2f46
...
@@ -727,7 +727,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -727,7 +727,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
strmov
(
delimiter
,
DEFAULT_DELIMITER
);
strmov
(
delimiter
,
DEFAULT_DELIMITER
);
else
else
strmake
(
delimiter
,
argument
,
sizeof
(
delimiter
)
-
1
);
strmake
(
delimiter
,
argument
,
sizeof
(
delimiter
)
-
1
);
delimiter_length
=
strlen
(
delimiter
);
delimiter_length
=
(
uint
)
strlen
(
delimiter
);
delimiter_str
=
delimiter
;
delimiter_str
=
delimiter
;
break
;
break
;
case
OPT_LOCAL_INFILE
:
case
OPT_LOCAL_INFILE
:
...
@@ -1663,7 +1663,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
...
@@ -1663,7 +1663,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
if
(
!
connected
&&
reconnect
())
if
(
!
connected
&&
reconnect
())
return
1
;
return
1
;
if
((
error
=
mysql_real_query_for_lazy
(
server_cmd
,
strlen
(
server_cmd
)))
||
if
((
error
=
mysql_real_query_for_lazy
(
server_cmd
,
(
int
)
strlen
(
server_cmd
)))
||
(
error
=
mysql_store_result_for_lazy
(
&
result
)))
(
error
=
mysql_store_result_for_lazy
(
&
result
)))
return
error
;
return
error
;
...
@@ -1749,7 +1749,7 @@ com_help(String *buffer __attribute__((unused)),
...
@@ -1749,7 +1749,7 @@ com_help(String *buffer __attribute__((unused)),
for
(
i
=
0
;
commands
[
i
].
name
;
i
++
)
for
(
i
=
0
;
commands
[
i
].
name
;
i
++
)
{
{
end
=
strmov
(
buff
,
commands
[
i
].
name
);
end
=
strmov
(
buff
,
commands
[
i
].
name
);
for
(
j
=
strlen
(
commands
[
i
].
name
);
j
<
10
;
j
++
)
for
(
j
=
(
int
)
strlen
(
commands
[
i
].
name
);
j
<
10
;
j
++
)
end
=
strmov
(
end
,
" "
);
end
=
strmov
(
end
,
" "
);
if
(
commands
[
i
].
func
)
if
(
commands
[
i
].
func
)
tee_fprintf
(
stdout
,
"%s(
\\
%c) %s
\n
"
,
buff
,
tee_fprintf
(
stdout
,
"%s(
\\
%c) %s
\n
"
,
buff
,
...
@@ -2126,7 +2126,7 @@ print_table_data_xml(MYSQL_RES *result)
...
@@ -2126,7 +2126,7 @@ print_table_data_xml(MYSQL_RES *result)
mysql_field_seek
(
result
,
0
);
mysql_field_seek
(
result
,
0
);
tee_fputs
(
"<?xml version=
\"
1.0
\"
?>
\n\n
<resultset statement=
\"
"
,
PAGER
);
tee_fputs
(
"<?xml version=
\"
1.0
\"
?>
\n\n
<resultset statement=
\"
"
,
PAGER
);
xmlencode_print
(
glob_buffer
.
ptr
(),
strlen
(
glob_buffer
.
ptr
()));
xmlencode_print
(
glob_buffer
.
ptr
(),
(
int
)
strlen
(
glob_buffer
.
ptr
()));
tee_fputs
(
"
\"
>"
,
PAGER
);
tee_fputs
(
"
\"
>"
,
PAGER
);
fields
=
mysql_fetch_fields
(
result
);
fields
=
mysql_fetch_fields
(
result
);
...
@@ -2615,7 +2615,7 @@ com_delimiter(String *buffer __attribute__((unused)), char *line)
...
@@ -2615,7 +2615,7 @@ com_delimiter(String *buffer __attribute__((unused)), char *line)
return
0
;
return
0
;
}
}
strmake
(
delimiter
,
tmp
,
sizeof
(
delimiter
)
-
1
);
strmake
(
delimiter
,
tmp
,
sizeof
(
delimiter
)
-
1
);
delimiter_length
=
strlen
(
delimiter
);
delimiter_length
=
(
int
)
strlen
(
delimiter
);
delimiter_str
=
delimiter
;
delimiter_str
=
delimiter
;
return
0
;
return
0
;
}
}
...
@@ -2625,8 +2625,6 @@ static int
...
@@ -2625,8 +2625,6 @@ static int
com_use
(
String
*
buffer
__attribute__
((
unused
)),
char
*
line
)
com_use
(
String
*
buffer
__attribute__
((
unused
)),
char
*
line
)
{
{
char
*
tmp
,
buff
[
FN_REFLEN
+
1
];
char
*
tmp
,
buff
[
FN_REFLEN
+
1
];
MYSQL_RES
*
res
;
MYSQL_ROW
row
;
bzero
(
buff
,
sizeof
(
buff
));
bzero
(
buff
,
sizeof
(
buff
));
strmov
(
buff
,
line
);
strmov
(
buff
,
line
);
...
...
client/readline.cc
View file @
877b2f46
...
@@ -108,7 +108,7 @@ init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
...
@@ -108,7 +108,7 @@ init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
*/
*/
static
bool
init_line_buffer_from_string
(
LINE_BUFFER
*
buffer
,
my_string
str
)
static
bool
init_line_buffer_from_string
(
LINE_BUFFER
*
buffer
,
my_string
str
)
{
{
uint
old_length
=
buffer
->
end
-
buffer
->
buffer
;
uint
old_length
=
(
uint
)(
buffer
->
end
-
buffer
->
buffer
)
;
uint
length
=
(
uint
)
strlen
(
str
);
uint
length
=
(
uint
)
strlen
(
str
);
if
(
!
(
buffer
->
buffer
=
buffer
->
start_of_line
=
buffer
->
end_of_line
=
if
(
!
(
buffer
->
buffer
=
buffer
->
start_of_line
=
buffer
->
end_of_line
=
(
char
*
)
my_realloc
(
buffer
->
buffer
,
old_length
+
length
+
2
,
(
char
*
)
my_realloc
(
buffer
->
buffer
,
old_length
+
length
+
2
,
...
...
client/sql_string.cc
View file @
877b2f46
...
@@ -544,7 +544,7 @@ int String::reserve(uint32 space_needed, uint32 grow_by)
...
@@ -544,7 +544,7 @@ int String::reserve(uint32 space_needed, uint32 grow_by)
void
String
::
qs_append
(
const
char
*
str
)
void
String
::
qs_append
(
const
char
*
str
)
{
{
int
len
=
strlen
(
str
);
int
len
=
(
int
)
strlen
(
str
);
memcpy
(
Ptr
+
str_length
,
str
,
len
+
1
);
memcpy
(
Ptr
+
str_length
,
str
,
len
+
1
);
str_length
+=
len
;
str_length
+=
len
;
}
}
...
@@ -553,7 +553,7 @@ void String::qs_append(double d)
...
@@ -553,7 +553,7 @@ void String::qs_append(double d)
{
{
char
*
buff
=
Ptr
+
str_length
;
char
*
buff
=
Ptr
+
str_length
;
sprintf
(
buff
,
"%.14g"
,
d
);
sprintf
(
buff
,
"%.14g"
,
d
);
str_length
+=
strlen
(
buff
);
str_length
+=
(
int
)
strlen
(
buff
);
}
}
void
String
::
qs_append
(
double
*
d
)
void
String
::
qs_append
(
double
*
d
)
...
...
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