summaryrefslogtreecommitdiff
path: root/sql/sql_locale.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2016-05-10 19:13:06 +0400
committerAlexander Barkov <bar@mariadb.org>2016-05-10 19:13:06 +0400
commit964c4f070a7e96bf45979d8755beb10aa6e6617b (patch)
tree415424175ada49bdc0bacca8a5d466f601f61e08 /sql/sql_locale.h
parent672bbcd7411b20e87eca7845aceed81f361d6424 (diff)
downloadmariadb-git-964c4f070a7e96bf45979d8755beb10aa6e6617b.tar.gz
MDEV-10052 Illegal mix of collations with DAYNAME(date_field)<>varchar_field
Diffstat (limited to 'sql/sql_locale.h')
-rw-r--r--sql/sql_locale.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_locale.h b/sql/sql_locale.h
index 8357a9ecba4..8559bb55cd9 100644
--- a/sql/sql_locale.h
+++ b/sql/sql_locale.h
@@ -61,6 +61,8 @@ public:
grouping(grouping_par),
errmsgs(errmsgs_par)
{}
+ uint repertoire() const
+ { return is_ascii ? MY_REPERTOIRE_ASCII : MY_REPERTOIRE_EXTENDED; }
};
/* Exported variables */