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

MariaDB · Aug 6, 2017 · 24a25a2 · 24a25a2
2 parents 93a6eed + 6d51817
commit 24a25a2
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 5 deletions.
diff --git a/debian/mariadb-server-core-10.2.install b/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

diff --git a/mysql-test/suite/plugins/r/locales.result b/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

diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt
@@ -38,6 +38,7 @@ russian
 czech
 french
 serbian
+hindi
 )
 
 SET(files