summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-04-24 20:59:57 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-04-24 20:59:57 +0300
commit7396dfcca7a1eb906edabec02fb59d168f09343d (patch)
tree5971546f2d27f5a8dc186e0f63ae3d2ac9208a6a /client/mysql.cc
parentf79c5a658cc33a10d7744a748a4328254e2cbaf7 (diff)
parent7b5543b21d31bd1517b49c2524a05b5b83fd9691 (diff)
downloadmariadb-git-7396dfcca7a1eb906edabec02fb59d168f09343d.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index cb5c2318698..9569ff6196f 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3130,7 +3130,7 @@ static int
com_help(String *buffer __attribute__((unused)),
char *line __attribute__((unused)))
{
- reg1 int i, j;
+ int i, j;
char * help_arg= strchr(line,' '), buff[32], *end;
if (help_arg)
{