diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-04 17:46:28 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-04 17:46:28 +0100 |
| commit | 008ee867a4cc80e079bd2a8b7f8c8543d80c31f1 (patch) | |
| tree | 9a971dca67c9edeabeb655b2275aea4b76729333 /client | |
| parent | 670c9a3a182cfc3a75bc8ed847cadb2931aaaec4 (diff) | |
| parent | c9b9eb331570704d020fcc7c7894f19febe7f26d (diff) | |
| download | mariadb-git-008ee867a4cc80e079bd2a8b7f8c8543d80c31f1.tar.gz | |
Merge branch '10.2' into 10.3
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 d5001d335b6..d5ab1a12c7a 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3211,7 +3211,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; @@ -3231,7 +3231,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); @@ -3296,7 +3296,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) |