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
d8a6e41c
Commit
d8a6e41c
authored
Feb 28, 2006
by
paul@snake-hub.snake.net
Browse files
Options
Browse Files
Download
Plain Diff
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
parents
7ff2ede8
d6654fe9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
client/mysqltest.c
client/mysqltest.c
+4
-3
mysql-test/README
mysql-test/README
+1
-1
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+2
-2
mysql-test/r/mysqltest.result
mysql-test/r/mysqltest.result
+2
-0
No files found.
client/mysqltest.c
View file @
d8a6e41c
...
...
@@ -1647,18 +1647,19 @@ int do_sleep(struct st_query *query, my_bool real_sleep)
char
*
p
=
query
->
first_argument
;
char
*
sleep_start
,
*
sleep_end
=
query
->
end
;
double
sleep_val
;
char
*
cmd
=
(
real_sleep
?
"real_sleep"
:
"sleep"
);
while
(
my_isspace
(
charset_info
,
*
p
))
p
++
;
if
(
!*
p
)
die
(
"Missing argument to
sleep"
);
die
(
"Missing argument to
%s"
,
cmd
);
sleep_start
=
p
;
/* Check that arg starts with a digit, not handled by my_strtod */
if
(
!
my_isdigit
(
charset_info
,
*
sleep_start
))
die
(
"Invalid argument to
sleep
\"
%s
\"
"
,
query
->
first_argument
);
die
(
"Invalid argument to
%s
\"
%s
\"
"
,
cmd
,
query
->
first_argument
);
sleep_val
=
my_strtod
(
sleep_start
,
&
sleep_end
,
&
error
);
if
(
error
)
die
(
"Invalid argument to
sleep
\"
%s
\"
"
,
query
->
first_argument
);
die
(
"Invalid argument to
%s
\"
%s
\"
"
,
cmd
,
query
->
first_argument
);
/* Fixed sleep time selected by --sleep option */
if
(
opt_sleep
&&
!
real_sleep
)
...
...
mysql-test/README
View file @
d8a6e41c
...
...
@@ -21,7 +21,7 @@ conflict with it.
All tests must pass. If one or more of them fail on your system, please
read the following manual section of how to report the problem:
http://dev.mysql.com/doc/mysql/en/
MySQL_test_
suite.html
http://dev.mysql.com/doc/mysql/en/
mysql-test-
suite.html
You can create your own test cases. To create a test case:
...
...
mysql-test/mysql-test-run.sh
View file @
d8a6e41c
...
...
@@ -894,7 +894,7 @@ show_failed_diff ()
$DIFF
-c
$result_file
$reject_file
echo
"-------------------------------------------------------"
echo
"Please follow the instructions outlined at"
echo
"http://
www.mysql.com/doc/en/Reporting_mysqltest_
bugs.html"
echo
"http://
dev.mysql.com/doc/mysql/en/reporting-mysqltest-
bugs.html"
echo
"to find the reason to this problem and how to report this."
echo
""
fi
...
...
@@ -990,7 +990,7 @@ report_stats () {
$ECHO
"The log files in
$MY_LOG_DIR
may give you some hint"
$ECHO
"of what went wrong."
$ECHO
"If you want to report this error, please read first the documentation at"
$ECHO
"http://
www.mysql.com/doc/en/MySQL_test_
suite.html"
$ECHO
"http://
dev.mysql.com/doc/mysql/en/mysql-test-
suite.html"
fi
if
[
$USE_RUNNING_SERVER
-eq
0
]
...
...
mysql-test/r/mysqltest.result
View file @
d8a6e41c
...
...
@@ -297,7 +297,9 @@ here is the sourced script
In loop
here is the sourced script
mysqltest: At line 1: Missing argument to sleep
mysqltest: At line 1: Missing argument to real_sleep
mysqltest: At line 1: Invalid argument to sleep "abc"
mysqltest: At line 1: Invalid argument to real_sleep "abc"
1
2
101
...
...
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