diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 14:45:06 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 14:45:06 +0100 |
| commit | f8b5e147da18d0baa7345aed0deec0fd40666d19 (patch) | |
| tree | c0b0cbb9bc0f5afd6ca123604a67323bdc521099 /client | |
| parent | 543f22a2d0633e645fb49a360c55528d8cb008fb (diff) | |
| parent | 117c8146de7ccfaf2331225d6fb264de71aa6779 (diff) | |
| download | mariadb-git-f8b5e147da18d0baa7345aed0deec0fd40666d19.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 2247e93ca93..d672473798e 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3213,7 +3213,7 @@ static int com_go(String *buffer,char *line __attribute__((unused))) { char buff[200]; /* about 110 chars used so far */ - char time_buff[52+3+1]; /* time max + space&parens + NUL */ + char time_buff[52+3+1]; /* time max + space & parens + NUL */ MYSQL_RES *result; ulong timer, warnings= 0; uint error= 0; @@ -3232,7 +3232,7 @@ com_go(String *buffer,char *line __attribute__((unused))) if (buffer->is_empty()) { - if (status.batch) // Ignore empty quries + if (status.batch) // Ignore empty queries. return 0; return put_info("No query specified\n",INFO_ERROR); @@ -3297,7 +3297,7 @@ com_go(String *buffer,char *line __attribute__((unused))) else time_buff[0]= '\0'; - /* Every branch must truncate buff . */ + /* Every branch must truncate buff. */ if (result) { if (!mysql_num_rows(result) && ! quick && !column_types_flag) |