database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-09-30 11:01:07 +03:00
parent 8dd4794c4e a49e394399
commit b36d6f92a8
80 changed files with 1876 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
strings/ctype-sjis.c
View File

@@ -19,6 +19,7 @@
#include "strings_def.h"
#include <m_ctype.h>
#include "ctype-mb.h"
#ifdef HAVE_CHARSET_sjis
@@ -34068,7 +34069,9 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_japanese_ci=
my_strcasecmp_8bit,
my_instr_mb,
my_hash_sort_simple,
my_propagate_simple
my_propagate_simple,
my_min_str_mb_simple,
my_max_str_mb_simple
};
@@ -34084,7 +34087,9 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_bin=
my_strcasecmp_mb_bin,
my_instr_mb,
my_hash_sort_mb_bin,
my_propagate_simple
my_propagate_simple,
my_min_str_mb_simple,
my_max_str_mb_simple
};
@@ -34100,7 +34105,9 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_japanese_nopad_ci=
my_strcasecmp_8bit,
my_instr_mb,
my_hash_sort_simple_nopad,
my_propagate_simple
my_propagate_simple,
my_min_str_mb_simple_nopad,
my_max_str_mb_simple
};
@@ -34116,7 +34123,9 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_nopad_bin=
my_strcasecmp_mb_bin,
my_instr_mb,
my_hash_sort_mb_nopad_bin,
my_propagate_simple
my_propagate_simple,
my_min_str_mb_simple_nopad,
my_max_str_mb_simple
};