diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
| commit | beded7d9c9592ca8fdfc367f7c64f89c35995c44 (patch) | |
| tree | a215a54ed5043bb17fe7d69a69439e05b21682d5 /sql/handler.cc | |
| parent | af71da5d2f90c82b2357e808640003907c488bc2 (diff) | |
| parent | 2553f143fdeb9068eb02a8fda58750c24071f5ef (diff) | |
| download | mariadb-git-beded7d9c9592ca8fdfc367f7c64f89c35995c44.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0f341a0ccc5..193d36a1122 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -5113,7 +5113,7 @@ bool Discovered_table_list::add_table(const char *tname, size_t tlen) custom discover_table_names() method, that calls add_table() directly). Note: avoid comparing the same name twice (here and in add_file). */ - if (wild && my_wildcmp(files_charset_info, tname, tname + tlen, wild, wend, + if (wild && my_wildcmp(table_alias_charset, tname, tname + tlen, wild, wend, wild_prefix, wild_one, wild_many)) return 0; |