Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks

debian/mariadb-server-core-10.2.install

@@ -10,6 +10,7 @@ usr/share/mysql/estonian
 usr/share/mysql/french
 usr/share/mysql/german
 usr/share/mysql/greek
+usr/share/mysql/hindi
 usr/share/mysql/hungarian
 usr/share/mysql/italian
 usr/share/mysql/japanese

mysql-test/suite/plugins/r/locales.result

@@ -25,7 +25,7 @@ ID	NAME	DESCRIPTION	MAX_MONTH_NAME_LENGTH	MAX_DAY_NAME_LENGTH	DECIMAL_POINT	THOU
 22	gl_ES	Galician - Galician	8	8	,		english
 23	gu_IN	Gujarati - India	10	8	.	,	english
 24	he_IL	Hebrew - Israel	7	5	.	,	english
-25	hi_IN	Hindi - India	7	9	.	,	english
+25	hi_IN	Hindi - India	7	9	.	,	hindi
 26	hr_HR	Croatian - Croatia	8	11	,		english
 27	hu_HU	Hungarian - Hungary	10	9	,	.	hungarian
 28	id_ID	Indonesian - Indonesia	9	6	,	.	english
@@ -138,7 +138,7 @@ Id	Name	Description	Error_Message_Language
 22	gl_ES	Galician - Galician	english
 23	gu_IN	Gujarati - India	english
 24	he_IL	Hebrew - Israel	english
-25	hi_IN	Hindi - India	english
+25	hi_IN	Hindi - India	hindi
 26	hr_HR	Croatian - Croatia	english
 27	hu_HU	Hungarian - Hungary	hungarian
 28	id_ID	Indonesian - Indonesia	english

sql/share/CMakeLists.txt

@@ -38,6 +38,7 @@ russian
 czech
 french
 serbian
+hindi
 )
 
 SET(files 

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 *****/