diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 47682c34fea..45952dbeceb 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_PREREQ(2.59) # Remember to also update version.c in ndb. # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). -AC_INIT([MariaDB Server], [5.1.44-MariaDB], [], [mysql]) +AC_INIT([MariaDB Server], [5.1.44a-MariaDB], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index f99c34ec39a..9cfee43fa36 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -4116,6 +4116,10 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)), { int code; char hex[]= "0123456789abcdef"; + + if (s >= e) + return MY_CS_TOOSMALL; + if (wc < 128 && filename_safe_char[wc]) { *s= (uchar) wc; |