diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:14:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:14:58 +0100 |
| commit | 7002291b8aa2e036a7adfd23d961dc09b4f01f46 (patch) | |
| tree | 18dc7afd966c2c7ec6b02b958d3d4bb0c701b021 /sql/item_cmpfunc.cc | |
| parent | d79fd5ba7ff275c9fd003f2486b42eb87892ca9a (diff) | |
| parent | 56394a78e361bf0205a506185ee95a0ab012b621 (diff) | |
| download | mariadb-git-7002291b8aa2e036a7adfd23d961dc09b4f01f46.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index c50b3e58a19..fcb78ca0003 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -5417,7 +5417,7 @@ void Regexp_processor_pcre::pcre_exec_warn(int rc) const switch (rc) { case PCRE_ERROR_NULL: - errmsg= "pcre_exec: null arguement passed"; + errmsg= "pcre_exec: null argument passed"; break; case PCRE_ERROR_BADOPTION: errmsg= "pcre_exec: bad option"; |