diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-04-28 10:37:56 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-04-28 10:52:11 +0400 |
| commit | 0e4bc67eab9bbe75109b88bdcf1b3631fce35c04 (patch) | |
| tree | 5b592d6b4503ed71ba057b08f7e3ccfcb4ef33ba | |
| parent | 39feab3cd31b5414aa9b428eaba915c251ac34a2 (diff) | |
| download | mariadb-git-0e4bc67eab9bbe75109b88bdcf1b3631fce35c04.tar.gz | |
10.4 specific changes for "MDEV-27494 Rename .ic files to .inl"
Renaming ctype-uca.ic to ctype-uca.inl
This file was introduced in 10.4,
so it did not get to the main 10.2 patch for MDEV-27494
| -rw-r--r-- | strings/ctype-uca.c | 16 | ||||
| -rw-r--r-- | strings/ctype-uca.inl (renamed from strings/ctype-uca.ic) | 0 |
2 files changed, 8 insertions, 8 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 551efd8b0be..fbca4df39e7 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -33810,7 +33810,7 @@ static void my_uca_handler_map(struct charset_info_st *cs, #define MY_UCA_ASCII_OPTIMIZE 0 #define MY_UCA_COMPILE_CONTRACTIONS 1 #define MY_UCA_COLL_INIT my_coll_init_uca -#include "ctype-uca.ic" +#include "ctype-uca.inl" /* @@ -33915,7 +33915,7 @@ ex: #define MY_UCA_ASCII_OPTIMIZE 0 #define MY_UCA_COMPILE_CONTRACTIONS 1 #define MY_UCA_COLL_INIT my_coll_init_uca -#include "ctype-uca.ic" +#include "ctype-uca.inl" #define MY_CS_UCS2_UCA_FLAGS (MY_CS_COMMON_UCA_FLAGS|MY_CS_NONASCII) @@ -34878,7 +34878,7 @@ my_uca_coll_init_utf8mb3(struct charset_info_st *cs, MY_CHARSET_LOADER *loader); #define MY_UCA_ASCII_OPTIMIZE 1 #define MY_UCA_COMPILE_CONTRACTIONS 1 #define MY_UCA_COLL_INIT my_uca_coll_init_utf8mb3 -#include "ctype-uca.ic" +#include "ctype-uca.inl" #define MY_FUNCTION_NAME(x) my_uca_ ## x ## _no_contractions_utf8mb3 #define MY_MB_WC(scanner, wc, beg, end) (my_mb_wc_utf8mb3_quick(wc, beg, end)) @@ -34886,7 +34886,7 @@ my_uca_coll_init_utf8mb3(struct charset_info_st *cs, MY_CHARSET_LOADER *loader); #define MY_UCA_ASCII_OPTIMIZE 1 #define MY_UCA_COMPILE_CONTRACTIONS 0 #define MY_UCA_COLL_INIT my_uca_coll_init_utf8mb3 -#include "ctype-uca.ic" +#include "ctype-uca.inl" static my_bool @@ -35883,7 +35883,7 @@ my_uca_coll_init_utf8mb4(struct charset_info_st *cs, MY_CHARSET_LOADER *loader); #define MY_UCA_ASCII_OPTIMIZE 1 #define MY_UCA_COMPILE_CONTRACTIONS 1 #define MY_UCA_COLL_INIT my_uca_coll_init_utf8mb4 -#include "ctype-uca.ic" +#include "ctype-uca.inl" #define MY_FUNCTION_NAME(x) my_uca_ ## x ## _no_contractions_utf8mb4 #define MY_MB_WC(scanner, wc, beg, end) (my_mb_wc_utf8mb4_quick(wc, beg, end)) @@ -35891,7 +35891,7 @@ my_uca_coll_init_utf8mb4(struct charset_info_st *cs, MY_CHARSET_LOADER *loader); #define MY_UCA_ASCII_OPTIMIZE 1 #define MY_UCA_COMPILE_CONTRACTIONS 0 #define MY_UCA_COLL_INIT my_uca_coll_init_utf8mb4 -#include "ctype-uca.ic" +#include "ctype-uca.inl" static my_bool @@ -36859,7 +36859,7 @@ struct charset_info_st my_charset_utf8mb4_unicode_520_nopad_ci= #define MY_UCA_ASCII_OPTIMIZE 0 #define MY_UCA_COMPILE_CONTRACTIONS 1 #define MY_UCA_COLL_INIT my_coll_init_uca -#include "ctype-uca.ic" +#include "ctype-uca.inl" extern MY_CHARSET_HANDLER my_charset_utf32_handler; @@ -37817,7 +37817,7 @@ struct charset_info_st my_charset_utf32_unicode_520_nopad_ci= #define MY_UCA_ASCII_OPTIMIZE 0 #define MY_UCA_COMPILE_CONTRACTIONS 1 #define MY_UCA_COLL_INIT my_coll_init_uca -#include "ctype-uca.ic" +#include "ctype-uca.inl" extern MY_CHARSET_HANDLER my_charset_utf16_handler; diff --git a/strings/ctype-uca.ic b/strings/ctype-uca.inl index 7c9d34d217e..7c9d34d217e 100644 --- a/strings/ctype-uca.ic +++ b/strings/ctype-uca.inl |