summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <paul@snake-hub.snake.net>2006-02-28 12:01:24 -0600
committerunknown <paul@snake-hub.snake.net>2006-02-28 12:01:24 -0600
commit46c82ab153f5b19a5c55ef214bd60fb5ba76829a (patch)
tree97cbecc89b63bf8cfd1c3f73c45d2c2aa12f8b32 /client
parenta7abbd918ba952e2f387cec28ed0f74997b14975 (diff)
downloadmariadb-git-46c82ab153f5b19a5c55ef214bd60fb5ba76829a.tar.gz
mysqltest.c:
Fix typos. client/mysqltest.c: Fix typos.
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 613c4e12763..805c9330c6a 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -115,8 +115,8 @@ enum {OPT_MANAGER_USER=256,OPT_MANAGER_HOST,OPT_MANAGER_PASSWD,
The list of error codes to --error are stored in an internal array of
structs. This struct can hold numeric SQL error codes or SQLSTATE codes
as strings. The element next to the last active element in the list is
- set to type ERR_EMPTY. When an SQL statement return an error we use
- this list to check if this is an expected error.
+ set to type ERR_EMPTY. When an SQL statement returns an error, we use
+ this list to check if this is an expected error.
*/
enum match_err_type
@@ -986,8 +986,8 @@ int do_source(struct st_query *query)
*p++= 0;
query->last_argument= p;
/*
- If this file has already been sourced, dont source it again.
- It's already available in the q_lines cache
+ If this file has already been sourced, don't source it again.
+ It's already available in the q_lines cache.
*/
if (parser.current_line < (parser.read_lines - 1))
return 0;
@@ -2151,7 +2151,7 @@ my_bool end_of_query(int c)
Normally that means it will read lines until it reaches the
"delimiter" that marks end of query. Default delimiter is ';'
The function should be smart enough not to detect delimiter's
- found inside strings sorrounded with '"' and '\'' escaped strings.
+ found inside strings surrounded with '"' and '\'' escaped strings.
If the first line in a query starts with '#' or '-' this line is treated
as a comment. A comment is always terminated when end of line '\n' is
@@ -2485,7 +2485,7 @@ static struct my_option my_long_options[] =
{"result-file", 'R', "Read/Store result from/in this file.",
(gptr*) &result_file, (gptr*) &result_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
- {"server-arg", 'A', "Send enbedded server this as a paramenter.",
+ {"server-arg", 'A', "Send option value to embedded server as a parameter.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"server-file", 'F', "Read embedded server arguments from file.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -4074,8 +4074,8 @@ int main(int argc, char **argv)
/*
my_stat() successful on result file. Check if we have not run a
single query, but we do have a result file that contains data.
- Note that we don't care, if my_stat() fails. For example for
- non-existing or non-readable file we assume it's fine to have
+ Note that we don't care, if my_stat() fails. For example, for a
+ non-existing or non-readable file, we assume it's fine to have
no query output from the test file, e.g. regarded as no error.
*/
if (res_info.st_size)