diff options
| author | unknown <bar@mysql.com> | 2006-04-04 15:40:42 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-04-04 15:40:42 +0500 |
| commit | ff3495c414db76a34067bf75c64e9e840fb2c8a6 (patch) | |
| tree | a8926b4346753c1fc2c5ed64f4e0685f6c253a7c /strings/conf_to_src.c | |
| parent | d6d7213d68046269e7afdbdef4e38c1c6f0c9838 (diff) | |
| download | mariadb-git-ff3495c414db76a34067bf75c64e9e840fb2c8a6.tar.gz | |
After merge fix for Bug#12076 --with-extra-charsets has no effect
mysql-test/r/information_schema.result:
IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
IS_COMPILED is not determenistic
strings/conf_to_src.c:
Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
Recreating sources according to 5.0 XML files using conf_to_src.
Diffstat (limited to 'strings/conf_to_src.c')
| -rw-r--r-- | strings/conf_to_src.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 9ec2224ab62..700b6a91070 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -221,15 +221,19 @@ void dispcset(FILE *f,CHARSET_INFO *cs) } fprintf(f," NULL, /* from_uni */\n"); + fprintf(f," my_unicase_default, /* caseinfo */\n"); fprintf(f," NULL, /* state map */\n"); fprintf(f," NULL, /* ident map */\n"); fprintf(f," 1, /* strxfrm_multiply*/\n"); + fprintf(f," 1, /* caseup_multiply*/\n"); + fprintf(f," 1, /* casedn_multiply*/\n"); fprintf(f," 1, /* mbminlen */\n"); fprintf(f," 1, /* mbmaxlen */\n"); fprintf(f," 0, /* min_sort_char */\n"); fprintf(f," 255, /* max_sort_char */\n"); + fprintf(f," ' ', /* pad_char */\n"); fprintf(f," 0, /* escape_with_backslash_is_dangerous */\n"); - + fprintf(f," &my_charset_8bit_handler,\n"); if (cs->state & MY_CS_BINSORT) fprintf(f," &my_collation_8bit_bin_handler,\n"); |