diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 09:39:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 09:39:53 +0100 |
| commit | 117c8146de7ccfaf2331225d6fb264de71aa6779 (patch) | |
| tree | 425776b42c117501cc7968473485babc8a1c59a5 /client/mysql.cc | |
| parent | d930422e9e84aa1bc265963225dd29295203e9d3 (diff) | |
| parent | e3d3bbf59829e93e83ab05d831e92a742ffd7e32 (diff) | |
| download | mariadb-git-117c8146de7ccfaf2331225d6fb264de71aa6779.tar.gz | |
Merge branch '5.5' into 10.1
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 31c1d443607..47268887fbf 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3207,7 +3207,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; @@ -3226,7 +3226,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); @@ -3291,7 +3291,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) |