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
5565d329
Commit
5565d329
authored
Apr 10, 2007
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add --logdir option ot mysqltest
parent
8163d5ec
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
5 deletions
+12
-5
client/mysqltest.c
client/mysqltest.c
+12
-5
No files found.
client/mysqltest.c
View file @
5565d329
...
...
@@ -92,6 +92,7 @@ enum {
static
int
record
=
0
,
opt_sleep
=
-
1
;
static
char
*
db
=
0
,
*
pass
=
0
;
const
char
*
user
=
0
,
*
host
=
0
,
*
unix_sock
=
0
,
*
opt_basedir
=
"./"
;
const
char
*
opt_logdir
=
""
;
const
char
*
opt_include
=
0
,
*
opt_charsets_dir
;
static
int
port
=
0
;
static
int
opt_max_connect_retries
;
...
...
@@ -1009,7 +1010,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
die
(
NullS
);
if
(
!
eval_result
&&
(
uint
)
stat_info
.
st_size
!=
ds
->
length
)
{
DBUG_PRINT
(
"info"
,(
"Size differs: result size: %u file size: %l
l
u"
,
DBUG_PRINT
(
"info"
,(
"Size differs: result size: %u file size: %lu"
,
ds
->
length
,
stat_info
.
st_size
));
DBUG_PRINT
(
"info"
,(
"result: '%s'"
,
ds
->
str
));
DBUG_RETURN
(
RESULT_LENGTH_MISMATCH
);
...
...
@@ -4244,6 +4245,8 @@ static struct my_option my_long_options[] =
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"include"
,
'i'
,
"Include SQL before each test case."
,
(
gptr
*
)
&
opt_include
,
(
gptr
*
)
&
opt_include
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"logdir"
,
0
,
"Directory for log files"
,
(
gptr
*
)
&
opt_logdir
,
(
gptr
*
)
&
opt_logdir
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"mark-progress"
,
OPT_MARK_PROGRESS
,
"Write linenumber and elapsed time to <testname>.progress "
,
(
gptr
*
)
&
opt_mark_progress
,
(
gptr
*
)
&
opt_mark_progress
,
0
,
...
...
@@ -4546,15 +4549,18 @@ void dump_result_to_reject_file(char *buf, int size)
void
dump_result_to_log_file
(
char
*
buf
,
int
size
)
{
char
log_file
[
FN_REFLEN
];
str_to_file
(
fn_format
(
log_file
,
result_file_name
,
""
,
".log"
,
str_to_file
(
fn_format
(
log_file
,
result_file_name
,
opt_logdir
,
".log"
,
*
opt_logdir
?
MY_REPLACE_DIR
|
MY_REPLACE_EXT
:
MY_REPLACE_EXT
),
buf
,
size
);
}
void
dump_progress
(
void
)
{
char
log_file
[
FN_REFLEN
];
str_to_file
(
fn_format
(
log_file
,
result_file_name
,
""
,
".progress"
,
char
progress_file
[
FN_REFLEN
];
str_to_file
(
fn_format
(
progress_file
,
result_file_name
,
opt_logdir
,
".progress"
,
*
opt_logdir
?
MY_REPLACE_DIR
|
MY_REPLACE_EXT
:
MY_REPLACE_EXT
),
ds_progress
.
str
,
ds_progress
.
length
);
}
...
...
@@ -4563,7 +4569,8 @@ void dump_warning_messages(void)
{
char
warn_file
[
FN_REFLEN
];
str_to_file
(
fn_format
(
warn_file
,
result_file_name
,
""
,
".warnings"
,
str_to_file
(
fn_format
(
warn_file
,
result_file_name
,
opt_logdir
,
".warnings"
,
*
opt_logdir
?
MY_REPLACE_DIR
|
MY_REPLACE_EXT
:
MY_REPLACE_EXT
),
ds_warning_messages
.
str
,
ds_warning_messages
.
length
);
}
...
...
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