diff options
| author | elliot@mysql.com <> | 2005-08-19 18:17:54 -0400 |
|---|---|---|
| committer | elliot@mysql.com <> | 2005-08-19 18:17:54 -0400 |
| commit | 24f81a781e5c0a5ef340889680c47e35c3d576c6 (patch) | |
| tree | 15854f5f51df5ed07e6bbb6b08bc352ab998ffbc | |
| parent | e9ca1bd3a71831d30cdbc3bc1dc864856791a8eb (diff) | |
| download | mariadb-git-24f81a781e5c0a5ef340889680c47e35c3d576c6.tar.gz | |
Fix wrong auto-merge.
| -rw-r--r-- | strings/ctype-cp932.c | 2 | ||||
| -rw-r--r-- | strings/ctype-eucjpms.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c index f62cf2db599..b5f36c030bd 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -5522,6 +5522,7 @@ CHARSET_INFO my_charset_cp932_japanese_ci= 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler }; @@ -5552,6 +5553,7 @@ CHARSET_INFO my_charset_cp932_bin= 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler }; diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c index 2ab103d65ac..ccdca2ba595 100644 --- a/strings/ctype-eucjpms.c +++ b/strings/ctype-eucjpms.c @@ -8708,6 +8708,7 @@ CHARSET_INFO my_charset_eucjpms_japanese_ci= 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler }; @@ -8739,6 +8740,7 @@ CHARSET_INFO my_charset_eucjpms_bin= 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler }; |