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
5a9938e5
Commit
5a9938e5
authored
16 years ago
by
Magnus Svensson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings in mysqltest
parent
d7f846be
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
client/mysqltest.cc
client/mysqltest.cc
+5
-4
No files found.
client/mysqltest.cc
View file @
5a9938e5
...
@@ -546,8 +546,8 @@ public:
...
@@ -546,8 +546,8 @@ public:
DBUG_ASSERT
(
ds
->
str
);
DBUG_ASSERT
(
ds
->
str
);
if
(
fwrite
(
ds
->
str
,
1
,
ds
->
length
,
m_file
)
!=
ds
->
length
)
if
(
fwrite
(
ds
->
str
,
1
,
ds
->
length
,
m_file
)
!=
ds
->
length
)
die
(
"Failed to write %
d
bytes to '%s', errno: %d"
,
die
(
"Failed to write %
lu
bytes to '%s', errno: %d"
,
ds
->
length
,
m_file_name
,
errno
);
(
unsigned
long
)
ds
->
length
,
m_file_name
,
errno
);
m_bytes_written
+=
ds
->
length
;
m_bytes_written
+=
ds
->
length
;
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
@@ -585,7 +585,8 @@ public:
...
@@ -585,7 +585,8 @@ public:
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
DBUG_PRINT
(
"info"
,
(
"Read %d bytes from file, buf: %s"
,
bytes
,
buf
));
DBUG_PRINT
(
"info"
,
(
"Read %lu bytes from file, buf: %s"
,
(
unsigned
long
)
bytes
,
buf
));
char
*
show_from
=
buf
+
bytes
;
char
*
show_from
=
buf
+
bytes
;
while
(
show_from
>
buf
&&
lines
>
0
)
while
(
show_from
>
buf
&&
lines
>
0
)
...
@@ -2291,7 +2292,7 @@ void eval_expr(VAR *v, const char *p, const char **p_end)
...
@@ -2291,7 +2292,7 @@ void eval_expr(VAR *v, const char *p, const char **p_end)
const
char
*
end
=
*
p_end
+
1
;
const
char
*
end
=
*
p_end
+
1
;
if
(
end
<
expected_end
)
if
(
end
<
expected_end
)
die
(
"Found junk '%.*s' after $variable in expression"
,
die
(
"Found junk '%.*s' after $variable in expression"
,
expected_end
-
end
-
1
,
end
);
(
int
)(
expected_end
-
end
-
1
)
,
end
);
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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