summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-08-02 12:09:49 -0700
committerunknown <igor@rurik.mysql.com>2005-08-02 12:09:49 -0700
commit7c7843a2161705c30cb8af84cdc1d94b7b24555b (patch)
treefda6ff51b26035e9a98ce70509ddd925d7e54b59 /strings
parent6eb7a80aff5363f3f0d714d5c7c1d46561a42ba1 (diff)
parentc2b83502f9eac1ac06049aacbf68a70c342f2b27 (diff)
downloadmariadb-git-7c7843a2161705c30cb8af84cdc1d94b7b24555b.tar.gz
Manual merge
myisam/sort.c: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/t/fulltext.test: Auto merged sql/sql_select.cc: Auto merged strings/ctype-big5.c: Auto merged
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-big5.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index d311859907f..9ccbb149523 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -61,12 +61,12 @@ static uchar NEAR ctype_big5[257] =
2,2,2,2,2,2,2,2,2,2,2,16,16,16,16,32,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+ 3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,
};
static uchar NEAR to_lower_big5[]=