cleanup: use CREATE_TYPELIB_FOR

followup for f7387cb

Author: vuvova

sql/sql_locale.cc

@@ -3192,28 +3192,16 @@ static const char *my_locale_ab_day_names_el_GR[8]=
 };
 
 static TYPELIB my_locale_typelib_month_names_el_GR= 
-{
-  array_elements(my_locale_month_names_el_GR) - 1,
-  "", my_locale_month_names_el_GR, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_month_names_el_GR);
 
 static TYPELIB my_locale_typelib_ab_month_names_el_GR= 
-{
-  array_elements(my_locale_ab_month_names_el_GR)-1,
-  "", my_locale_ab_month_names_el_GR, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_ab_month_names_el_GR);
 
 static TYPELIB my_locale_typelib_day_names_el_GR= 
-{
-  array_elements(my_locale_day_names_el_GR)-1,
-  "", my_locale_day_names_el_GR, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_day_names_el_GR);
 
 static TYPELIB my_locale_typelib_ab_day_names_el_GR= 
-{
-  array_elements(my_locale_ab_day_names_el_GR) - 1,
-  "", my_locale_ab_day_names_el_GR, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_ab_day_names_el_GR);
 
 MY_LOCALE my_locale_el_GR
 (
@@ -3260,28 +3248,16 @@ static const char *my_locale_ab_day_names_rm_CH[8]=
 };
 
 static TYPELIB my_locale_typelib_month_names_rm_CH=
-{
-  array_elements(my_locale_month_names_rm_CH) - 1,
-  "", my_locale_month_names_rm_CH, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_month_names_rm_CH);
 
 static TYPELIB my_locale_typelib_ab_month_names_rm_CH=
-{
-  array_elements(my_locale_ab_month_names_rm_CH) - 1,
-  "", my_locale_ab_month_names_rm_CH, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_ab_month_names_rm_CH);
 
 static TYPELIB my_locale_typelib_day_names_rm_CH=
-{
-  array_elements(my_locale_day_names_rm_CH) - 1,
-   "", my_locale_day_names_rm_CH, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_day_names_rm_CH);
 
 static TYPELIB my_locale_typelib_ab_day_names_rm_CH=
-{
-  array_elements(my_locale_ab_day_names_rm_CH) - 1,
-  "", my_locale_ab_day_names_rm_CH, NULL, NULL
-};
+  CREATE_TYPELIB_FOR(my_locale_ab_day_names_rm_CH);
 
 MY_LOCALE my_locale_rm_CH
 (

storage/innobase/handler/ha_innodb.cc

@@ -342,12 +342,7 @@ const char* innodb_linux_aio_names[] = {
 
 /** Used to define an enumerate type of the system variable
 innodb_linux_aio. Used by mariadb-backup too. */
-TYPELIB innodb_linux_aio_typelib = {
-	array_elements(innodb_linux_aio_names) - 1,
-	"innodb_linux_aio_typelib",
-	innodb_linux_aio_names,
-	NULL, NULL
-};
+TYPELIB innodb_linux_aio_typelib = CREATE_TYPELIB_FOR(innodb_linux_aio_names);
 #endif
 
 /** Possible values of the parameter innodb_checksum_algorithm */

storage/maria/s3_func.c

@@ -43,7 +43,7 @@ static const char *protocol_types[]= {"Auto", "Original", "Amazon", "Legacy", "P
 TYPELIB s3_protocol_typelib= CREATE_TYPELIB_FOR(protocol_types);
 
 static const char *providers[]= {"Default", "Amazon", "Huawei", NullS};
-TYPELIB s3_provider_typelib = {array_elements(providers)-1,"",providers, NULL, NULL};
+TYPELIB s3_provider_typelib = CREATE_TYPELIB_FOR(providers);
 
 /******************************************************************************
  Allocations handler for libmarias3