MDEV-38580 TO_DATE should check both formatting and standalone month name

also fixed Serbian locale: Cyrillic was wrongly mapped to Latin
fixed locale.test, that was failing in mtr with --cursor protocol

Author: forkfun

mysql-test/main/locale.result

@@ -370,7 +370,7 @@ SET lc_messages=DEFAULT;
 # End of 10.11 tests
 #
 #
-# MDEV-38520 Add month name formatting (%M shows month names in genitive case)
+# MDEV-38520 Add formatting month's name (%B prints "formatting" months names, %M - "standalone" names)
 #
 SET lc_time_names=uk_UA;
 SELECT monthname('2001-10-01'), monthname('2001-02-15'), monthname('2001-03-30');
@@ -411,3 +411,18 @@ SELECT date_format('2026-04-16','%d %M %Y'), date_format('2026-08-24','%d %M %Y'
 date_format('2026-04-16','%d %M %Y')	date_format('2026-08-24','%d %M %Y')	date_format('2026-01-22','%d %M %Y')
 16 април 2026	24 август 2026	22 јануар 2026
 SET lc_time_names=DEFAULT;
+#
+# MDEV-38580 TO_DATE should check both formatting and standalone month name
+#
+SELECT TO_DATE('16 април 2026','DD MONTH YYYY','NLS_DATE_LANGUAGE=''CYRILLIC SERBIAN''') AS x FROM DUAL;
+x
+2026-04-16 00:00:00
+SELECT TO_DATE('15 april 2024','DD MONTH YYYY','NLS_DATE_LANGUAGE=''LATIN SERBIAN''') AS x FROM DUAL;
+x
+2024-04-15 00:00:00
+SELECT TO_DATE('15 квітень 2024','DD MONTH YYYY','NLS_DATE_LANGUAGE=''UKRAINIAN''') AS x FROM DUAL;
+x
+2024-04-15 00:00:00
+SELECT TO_DATE('15 квітня 2024','DD MONTH YYYY','NLS_DATE_LANGUAGE=''UKRAINIAN''') AS x FROM DUAL;
+x
+2024-04-15 00:00:00

mysql-test/main/locale.test

@@ -244,7 +244,7 @@ SET lc_messages=DEFAULT;
 
 
 --echo #
---echo # MDEV-38520 Add month name formatting (%M shows month names in genitive case)
+--echo # MDEV-38520 Add formatting month's name (%B prints "formatting" months names, %M - "standalone" names)
 --echo #
 
 SET lc_time_names=uk_UA;
@@ -274,3 +274,12 @@ SET lc_time_names=sr_Cyrl_RS;
 SELECT date_format('2026-04-16','%d %M %Y'), date_format('2026-08-24','%d %M %Y'), date_format('2026-01-22','%d %M %Y');
 
 SET lc_time_names=DEFAULT;
+
+--echo #
+--echo # MDEV-38580 TO_DATE should check both formatting and standalone month name
+--echo #
+
+SELECT TO_DATE('16 април 2026','DD MONTH YYYY','NLS_DATE_LANGUAGE=''CYRILLIC SERBIAN''') AS x FROM DUAL;
+SELECT TO_DATE('15 april 2024','DD MONTH YYYY','NLS_DATE_LANGUAGE=''LATIN SERBIAN''') AS x FROM DUAL;
+SELECT TO_DATE('15 квітень 2024','DD MONTH YYYY','NLS_DATE_LANGUAGE=''UKRAINIAN''') AS x FROM DUAL;
+SELECT TO_DATE('15 квітня 2024','DD MONTH YYYY','NLS_DATE_LANGUAGE=''UKRAINIAN''') AS x FROM DUAL;

sql/item_timefunc.cc

@@ -867,6 +867,8 @@ extract_oracle_date_time(THD *thd, uint16 *format_ptr,
       break;
     case FMT_MONTH:
       if ((l_time->month= check_word(val_cs, locale->month_names,
+                                     val, val_end, &val)) <= 0 &&
+        (l_time->month= check_word(val_cs, locale->month_names_formatting,
                                      val, val_end, &val)) <= 0)
         goto error;
       break;
@@ -2441,6 +2443,7 @@ uint Item_func_date_format::format_length(const String *format)
     {
       switch(*++ptr) {
       case 'M': /* month, textual */
+      case 'B': /* month, formatting */
       case 'W': /* day (of the week), textual */
 	size += 64; /* large for UTF8 locale data */
 	break;

sql/sql_locale.cc

@@ -3727,7 +3727,7 @@ struct ORACLE_DATE_LOCALE Oracle_date_locale[]=
   { "CATALAN"_Lex_ident_locale, &my_locale_ca_ES },
   { "CROATIAN"_Lex_ident_locale, &my_locale_hr_HR },
   //{ "CYRILLIC KAZAKH"_Lex_ident_locale, &my_locale_ckk },
-  { "CYRILLIC SERBIAN"_Lex_ident_locale, &my_locale_sr_RS },
+  { "CYRILLIC SERBIAN"_Lex_ident_locale, &my_locale_sr_Cyrl_RS },
   //{"CYRILLIC UZBEK"_Lex_ident_locale, &my_locale_cuz },
   { "CZECH"_Lex_ident_locale, &my_locale_cs_CZ },
   { "DANISH"_Lex_ident_locale, &my_locale_da_DK },
@@ -3757,7 +3757,7 @@ struct ORACLE_DATE_LOCALE Oracle_date_locale[]=
   //{ "LAO"_Lex_ident_locale, &my_locale_lo_LO },
   { "LATIN AMERICAN SPANISH"_Lex_ident_locale, &my_locale_es_ES },
   //{ "LATIN BOSNIAN"_Lex_ident_locale, &my_locale_lbs_LBS },
-  //{ "LATIN SERBIAN"_Lex_ident_locale, &my_locale_lsr_LSR },
+  { "LATIN SERBIAN"_Lex_ident_locale, &my_locale_sr_Latn_RS },
   //{ "LATIN UZBEK"_Lex_ident_locale, &my_locale_luz_LUZ },
   { "LATVIAN"_Lex_ident_locale, &my_locale_lv_LV },
   { "LITHUANIAN"_Lex_ident_locale, &my_locale_lt_LT },
@@ -3852,6 +3852,7 @@ void init_oracle_data_locale()
   for (locale= Oracle_date_locale; locale->locale ; locale++)
   {
     update_lengths_in_typelib(locale->locale->month_names);
+    update_lengths_in_typelib(locale->locale->month_names_formatting);
     update_lengths_in_typelib(locale->locale->ab_month_names);
     update_lengths_in_typelib(locale->locale->day_names);
     update_lengths_in_typelib(locale->locale->ab_day_names);