diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
| commit | 5a71e6bd5a61dff6d549d2c4f5927bbbd7ebcfee (patch) | |
| tree | 98ca05164f4a2bf2fce6e1644bc6335193e69bbd /sql/sql_locale.cc | |
| parent | 1710dd2bf286f9a240f380925a0067c57c1b29f9 (diff) | |
| parent | bf75dcac89d1496032015526dc6ce78d327e329f (diff) | |
| download | mariadb-git-bb-10-ext-mdev-13369.tar.gz | |
Merge branch 'bb-10.2-ext' into bb-10-ext-mdev-13369bb-10-ext-mdev-13369
# Conflicts:
# mysql-test/r/derived_cond_pushdown.result
# mysql-test/t/derived_cond_pushdown.test
# sql/sql_derived.cc
# sql/sql_select.cc
# sql/sql_select.h
Diffstat (limited to 'sql/sql_locale.cc')
| -rw-r--r-- | sql/sql_locale.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_locale.cc b/sql/sql_locale.cc index 58443a9a977..a2efa5e072c 100644 --- a/sql/sql_locale.cc +++ b/sql/sql_locale.cc @@ -32,7 +32,7 @@ enum err_msgs_index { en_US= 0, cs_CZ, da_DK, nl_NL, et_EE, fr_FR, de_DE, el_GR, hu_HU, it_IT, ja_JP, ko_KR, no_NO, nn_NO, pl_PL, pt_PT, ro_RO, ru_RU, sr_RS, sk_SK, - es_ES, sv_SE, uk_UA + es_ES, sv_SE, uk_UA, hi_IN } ERR_MSGS_INDEX; @@ -61,6 +61,7 @@ MY_LOCALE_ERRMSGS global_errmsgs[]= {"spanish", NULL}, {"swedish", NULL}, {"ukrainian", NULL}, + {"hindi", NULL}, {NULL, NULL} }; @@ -889,7 +890,7 @@ MY_LOCALE my_locale_hi_IN '.', /* decimal point hi_IN */ ',', /* thousands_sep hi_IN */ "\x03", /* grouping hi_IN */ - &global_errmsgs[en_US] + &global_errmsgs[hi_IN] ); /***** LOCALE END hi_IN *****/ |