1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Backporting WL#4164 Two-byte collation IDs

This commit is contained in:
Alexander Barkov
2009-10-15 15:17:32 +05:00
parent 583b853092
commit f8a54c72ff
13 changed files with 102 additions and 39 deletions

View File

@ -23,7 +23,7 @@
#define ROW16_LEN 8
#define MAX_BUF 64*1024
static CHARSET_INFO all_charsets[256];
static CHARSET_INFO all_charsets[512];
void
@ -63,7 +63,9 @@ print_array16(FILE *f, const char *set, const char *name, uint16 *a, int n)
static int get_charset_number(const char *charset_name)
{
CHARSET_INFO *cs;
for (cs= all_charsets; cs < all_charsets+255; ++cs)
for (cs= all_charsets;
cs < all_charsets + array_elements(all_charsets);
cs++)
{
if ( cs->name && !strcmp(cs->name, charset_name))
return cs->number;
@ -288,7 +290,9 @@ main(int argc, char **argv __attribute__((unused)))
sprintf(filename,"%s/%s",argv[1],"Index.xml");
my_read_charset_file(filename);
for (cs=all_charsets; cs < all_charsets+256; cs++)
for (cs= all_charsets;
cs < all_charsets + array_elements(all_charsets);
cs++)
{
if (cs->number && !(cs->state & MY_CS_COMPILED))
{
@ -313,7 +317,9 @@ main(int argc, char **argv __attribute__((unused)))
fprintf(f,"#include <m_ctype.h>\n\n");
for (cs=all_charsets; cs < all_charsets+256; cs++)
for (cs= all_charsets;
cs < all_charsets + array_elements(all_charsets);
cs++)
{
if (simple_cs_is_full(cs))
{
@ -330,7 +336,9 @@ main(int argc, char **argv __attribute__((unused)))
}
fprintf(f,"CHARSET_INFO compiled_charsets[] = {\n");
for (cs=all_charsets; cs < all_charsets+256; cs++)
for (cs= all_charsets;
cs < all_charsets + array_elements(all_charsets);
cs++)
{
if (simple_cs_is_full(cs))
{