diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-06-07 13:43:20 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-06-07 13:43:20 +0500 |
| commit | 2161964b531c2a8acd503ca388e609107c9cb2fc (patch) | |
| tree | b8462c86c91f45faaaa13a80020629eab4093d91 /strings | |
| parent | 95ad963620db1ffc62e5a0bc92b0788759b8dfb9 (diff) | |
| parent | 3babaecc412e3239d4c7bf4102a40fa6dbdaf335 (diff) | |
| download | mariadb-git-2161964b531c2a8acd503ca388e609107c9cb2fc.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b26711
into mysql.com:/home/bar/mysql-work/mysql-5.1.b26711
sql/sql_class.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-big5.c | 4 | ||||
| -rw-r--r-- | strings/ctype-gbk.c | 4 | ||||
| -rw-r--r-- | strings/ctype-sjis.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index a0571ff0b22..7bb811a3064 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6402,7 +6402,7 @@ CHARSET_INFO my_charset_big5_chinese_ci= 0, /* min_sort_char */ 255, /* max_sort_char */ ' ', /* pad char */ - 0, /* escape_with_backslash_is_dangerous */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_big5_handler, &my_collation_big5_chinese_ci_handler }; @@ -6435,7 +6435,7 @@ CHARSET_INFO my_charset_big5_bin= 0, /* min_sort_char */ 255, /* max_sort_char */ ' ', /* pad char */ - 0, /* escape_with_backslash_is_dangerous */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_big5_handler, &my_collation_mb_bin_handler }; diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index e9a2b7cf832..c7a2558eb37 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -10048,7 +10048,7 @@ CHARSET_INFO my_charset_gbk_chinese_ci= 0, /* min_sort_char */ 255, /* max_sort_char */ ' ', /* pad char */ - 0, /* escape_with_backslash_is_dangerous */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler }; @@ -10080,7 +10080,7 @@ CHARSET_INFO my_charset_gbk_bin= 0, /* min_sort_char */ 255, /* max_sort_char */ ' ', /* pad char */ - 0, /* escape_with_backslash_is_dangerous */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler }; diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index dfa8819a4db..ace457af63c 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4696,7 +4696,7 @@ CHARSET_INFO my_charset_sjis_japanese_ci= 0, /* min_sort_char */ 255, /* max_sort_char */ ' ', /* pad char */ - 0, /* escape_with_backslash_is_dangerous */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler }; @@ -4728,7 +4728,7 @@ CHARSET_INFO my_charset_sjis_bin= 0, /* min_sort_char */ 255, /* max_sort_char */ ' ', /* pad char */ - 0, /* escape_with_backslash_is_dangerous */ + 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler }; |