diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
commit | a15234bf4bf98d7833996284c033fc53a981f5d4 (patch) | |
tree | d989b448854f9d59de5ca16b962414591c8a5b2e /client/mysql.cc | |
parent | 9a6212008999da44b136605c1abf2cc9c7cc4b2c (diff) | |
parent | e5e5877740f248de848219ee3a1d2881cd5c5b82 (diff) | |
download | mariadb-git-a15234bf4bf98d7833996284c033fc53a981f5d4.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'client/mysql.cc')
-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 3cbe8859842..f4c10c59155 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3208,7 +3208,7 @@ static int com_go(String *buffer,char *line __attribute__((unused))) { char buff[200]; /* about 110 chars used so far */ - char time_buff[53+3+1]; /* time max + space&parens + NUL */ + char time_buff[53+3+1]; /* time max + space & parens + NUL */ MYSQL_RES *result; ulonglong timer; ulong warnings= 0; @@ -3228,7 +3228,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); @@ -3293,7 +3293,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) |