diff options
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 03cf635fd3d..c462e9ee662 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -574,10 +574,10 @@ char builtin_echo[FN_REFLEN]; struct st_replace_regex { -DYNAMIC_ARRAY regex_arr; /* stores a list of st_regex subsitutions */ +DYNAMIC_ARRAY regex_arr; /* stores a list of st_regex substitutions */ /* -Temporary storage areas for substitutions. To reduce unnessary copying +Temporary storage areas for substitutions. To reduce unnecessary copying and memory freeing/allocation, we pre-allocate two buffers, and alternate their use, one for input/one for output, the roles changing on the next st_regex substitution. At the end of substitutions buf points to the @@ -1943,7 +1943,7 @@ void show_diff(DYNAMIC_STRING* ds, needs special processing due to return values on that OS This test is only done on Windows since it's only needed there - in order to correctly detect non-availibility of 'diff', and + in order to correctly detect non-availability of 'diff', and the way it's implemented does not work with default 'diff' on Solaris. */ #ifdef _WIN32 @@ -2322,7 +2322,7 @@ static int strip_surrounding(char* str, char c1, char c2) /* Replace it with a space */ *ptr= ' '; - /* Last non space charecter should be c2 */ + /* Last non space character should be c2 */ ptr= strend(str)-1; while(*ptr && my_isspace(charset_info, *ptr)) ptr--; @@ -3091,7 +3091,7 @@ void open_file(const char *name) if overlay-dir is specified, and the file is located somewhere under overlay-dir or under suite-dir, the search works as follows: - 0.let suffix be current file dirname relative to siute-dir or overlay-dir + 0.let suffix be current file dirname relative to suite-dir or overlay-dir 1.try in overlay-dir/suffix 2.try in suite-dir/suffix 3.try in overlay-dir @@ -5655,7 +5655,7 @@ void do_close_connection(struct st_command *command) con->stmt= 0; #ifdef EMBEDDED_LIBRARY /* - As query could be still executed in a separate theread + As query could be still executed in a separate thread we need to check if the query's thread was finished and probably wait (embedded-server specific) */ @@ -5954,7 +5954,7 @@ void do_connect(struct st_command *command) { "connection name", ARG_STRING, TRUE, &ds_connection_name, "Name of the connection" }, { "host", ARG_STRING, TRUE, &ds_host, "Host to connect to" }, { "user", ARG_STRING, FALSE, &ds_user, "User to connect as" }, - { "passsword", ARG_STRING, FALSE, &ds_password, "Password used when connecting" }, + { "password", ARG_STRING, FALSE, &ds_password, "Password used when connecting" }, { "database", ARG_STRING, FALSE, &ds_database, "Database to select after connect" }, { "port", ARG_STRING, FALSE, &ds_port, "Port to connect to" }, { "socket", ARG_STRING, FALSE, &ds_sock, "Socket to connect with" }, @@ -6442,7 +6442,7 @@ void do_block(enum block_cmd cmd, struct st_command* command) } else { if (*expr_start != '`' && ! my_isdigit(charset_info, *expr_start)) - die("Expression in if/while must beging with $, ` or a number"); + die("Expression in if/while must begin with $, ` or a number"); eval_expr(&v, expr_start, &expr_end); } @@ -8356,7 +8356,7 @@ void handle_no_error(struct st_command *command) /* Run query using prepared statement C API - SYNPOSIS + SYNOPSIS run_query_stmt mysql - mysql handle command - current command pointer @@ -8599,6 +8599,7 @@ end: } } + DBUG_VOID_RETURN; } @@ -9053,7 +9054,7 @@ int util_query(MYSQL* org_mysql, const char* query){ /* Run query - SYNPOSIS + SYNOPSIS run_query() mysql mysql handle command current command pointer @@ -10817,7 +10818,7 @@ err: /* Execute all substitutions on val. - Returns: true if substituition was made, false otherwise + Returns: true if substitution was made, false otherwise Side-effect: Sets r->buf to be the buffer with all substitutions done. IN: @@ -10911,7 +10912,7 @@ void free_replace_regex() /* - auxiluary macro used by reg_replace + auxiliary macro used by reg_replace makes sure the result buffer has sufficient length */ #define SECURE_REG_BUF if (buf_len < need_buf_len) \ @@ -11450,7 +11451,7 @@ int init_sets(REP_SETS *sets,uint states) return 0; } -/* Make help sets invisible for nicer codeing */ +/* Make help sets invisible for nicer coding */ void make_sets_invisible(REP_SETS *sets) { |