diff options
| author | unknown <sanja@montyprogram.com> | 2014-02-05 20:35:11 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2014-02-05 20:35:11 +0200 |
| commit | 52311b72e6aee3fec0dc13f4273138f7aeea7d71 (patch) | |
| tree | cea3548235426688ce80bd07a46c82c24c6ea58a /client | |
| parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
| parent | bfdbb17990b198ff2a7e5eda5e2a365a1c6d8906 (diff) | |
| download | mariadb-git-52311b72e6aee3fec0dc13f4273138f7aeea7d71.tar.gz | |
merge 10.0-base ->10.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 73f583d46d3..a2e2ad55d66 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -8584,7 +8584,7 @@ char *re_eprint(int err) { static char epbuf[100]; size_t len __attribute__((unused))= - regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf)); + regerror(err, (regex_t *)NULL, epbuf, sizeof(epbuf)); assert(len <= sizeof(epbuf)); return(epbuf); } |