MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:bar Date:July 22 2005 4:06pm
Subject:bk commit into 4.1 tree (bar:1.2339) BUG#11987
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2339 05/07/22 21:06:02 bar@stripped +5 -0
  ctype-gbk.c:
    Bug #11987
    mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
    Allow to store and retrieve even unassigned GBK codes.
    Like we did in Big5 earlier.
  have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
    new file

  strings/ctype-gbk.c
    1.69 05/07/22 21:04:37 bar@stripped +38 -1
    Bug #11987
    mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
    Allow to store and retrieve even unassigned GBK codes.
    Like we did in Big5 earlier.

  mysql-test/include/have_gbk.inc
    1.1 05/07/22 21:03:55 bar@stripped +4 -0

  mysql-test/include/have_gbk.inc
    1.0 05/07/22 21:03:55 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b11987/mysql-test/include/have_gbk.inc

  mysql-test/r/have_gbk.require
    1.1 05/07/22 21:03:46 bar@stripped +2 -0

  mysql-test/r/have_gbk.require
    1.0 05/07/22 21:03:46 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b11987/mysql-test/r/have_gbk.require

  mysql-test/r/ctype_gbk.result
    1.1 05/07/22 21:03:37 bar@stripped +131 -0

  mysql-test/r/ctype_gbk.result
    1.0 05/07/22 21:03:37 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b11987/mysql-test/r/ctype_gbk.result

  mysql-test/t/ctype_gbk.test
    1.1 05/07/22 21:03:32 bar@stripped +30 -0

  mysql-test/t/ctype_gbk.test
    1.0 05/07/22 21:03:32 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b11987/mysql-test/t/ctype_gbk.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1.b11987

--- 1.68/strings/ctype-gbk.c	2005-07-06 17:13:57 +05:00
+++ 1.69/strings/ctype-gbk.c	2005-07-22 21:04:37 +05:00
@@ -9925,6 +9925,43 @@
 }
 
 
+/*
+  Returns well formed length of a GBK string.
+*/
+static
+uint my_well_formed_len_gbk(CHARSET_INFO *cs __attribute__((unused)),
+                            const char *b, const char *e,
+                            uint pos, int *error)
+{
+  const char *b0= b;
+  const char *emb= e - 1; /* Last possible end of an MB character */
+
+  *error= 0;
+  while (pos-- && b < e)
+  {
+    if ((uchar) b[0] < 128)
+    {
+      /* Single byte ascii character */
+      b++;
+    }
+    else  if ((b < emb) && isgbkcode((uchar)*b, (uchar)b[1]))
+    {
+      /* Double byte character */
+      b+= 2;
+    }
+    else
+    {
+      /* Wrong byte sequence */
+      *error= 1;
+      break;
+    }
+  }
+  return b - b0;
+}
+
+
+                             
+
 static MY_COLLATION_HANDLER my_collation_ci_handler =
 {
   NULL,			/* init */
@@ -9945,7 +9982,7 @@
   mbcharlen_gbk,
   my_numchars_mb,
   my_charpos_mb,
-  my_well_formed_len_mb,
+  my_well_formed_len_gbk,
   my_lengthsp_8bit,
   my_numcells_8bit,
   my_mb_wc_gbk,
--- New file ---
+++ mysql-test/include/have_gbk.inc	05/07/22 21:03:55
-- require r/have_gbk.require
disable_query_log;
show collation like "gbk_chinese_ci";
enable_query_log;

--- New file ---
+++ mysql-test/r/ctype_gbk.result	05/07/22 21:03:37
drop table if exists t1;
SET @test_character_set= 'gbk';
SET @test_collation= 'gbk_chinese_ci';
SET @safe_character_set_server= @@character_set_server;
SET @safe_collation_server= @@collation_server;
SET character_set_server= @test_character_set;
SET collation_server= @test_collation;
CREATE DATABASE d1;
USE d1;
CREATE TABLE t1 (c CHAR(10), KEY(c));
SHOW FULL COLUMNS FROM t1;
Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
c	char(10)	gbk_chinese_ci	YES	MUL	NULL			
INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');
SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
want3results
aaa
aaaa
aaaaa
DROP TABLE t1;
CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));
SHOW FULL COLUMNS FROM t1;
Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
c1	varchar(15)	gbk_chinese_ci	YES	MUL	NULL			
INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');
SELECT c1 as want3results from t1 where c1 like 'l%';
want3results
location
loberge
lotre
SELECT c1 as want3results from t1 where c1 like 'lo%';
want3results
location
loberge
lotre
SELECT c1 as want1result  from t1 where c1 like 'loc%';
want1result
location
SELECT c1 as want1result  from t1 where c1 like 'loca%';
want1result
location
SELECT c1 as want1result  from t1 where c1 like 'locat%';
want1result
location
SELECT c1 as want1result  from t1 where c1 like 'locati%';
want1result
location
SELECT c1 as want1result  from t1 where c1 like 'locatio%';
want1result
location
SELECT c1 as want1result  from t1 where c1 like 'location%';
want1result
location
DROP TABLE t1;
DROP DATABASE d1;
USE test;
SET character_set_server= @safe_character_set_server;
SET collation_server= @safe_collation_server;
SET NAMES gbk;
SET collation_connection='gbk_chinese_ci';
create table t1 select repeat('a',4000) a;
delete from t1;
insert into t1 values ('a'), ('a '), ('a\t');
select collation(a),hex(a) from t1 order by a;
collation(a)	hex(a)
gbk_chinese_ci	6109
gbk_chinese_ci	61
gbk_chinese_ci	6120
drop table t1;
create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
select collation(c1) from t1 limit 1;
collation(c1)
gbk_chinese_ci
select c1 from t1 where c1 like 'abcdef%' order by c1;
c1
abcdefg
select c1 from t1 where c1 like 'abcde1%' order by c1;
c1
abcde100
abcde110
abcde111
select c1 from t1 where c1 like 'abcde11%' order by c1;
c1
abcde110
abcde111
select c1 from t1 where c1 like 'abcde111%' order by c1;
c1
abcde111
drop table t1;
SET collation_connection='gbk_bin';
create table t1 select repeat('a',4000) a;
delete from t1;
insert into t1 values ('a'), ('a '), ('a\t');
select collation(a),hex(a) from t1 order by a;
collation(a)	hex(a)
gbk_bin	6109
gbk_bin	61
gbk_bin	6120
drop table t1;
create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
select collation(c1) from t1 limit 1;
collation(c1)
gbk_bin
select c1 from t1 where c1 like 'abcdef%' order by c1;
c1
abcdefg
select c1 from t1 where c1 like 'abcde1%' order by c1;
c1
abcde100
abcde110
abcde111
select c1 from t1 where c1 like 'abcde11%' order by c1;
c1
abcde110
abcde111
select c1 from t1 where c1 like 'abcde111%' order by c1;
c1
abcde111
drop table t1;
SET NAMES gbk;
CREATE TABLE t1 (a text) character set gbk;
INSERT INTO t1 VALUES (0xA3A0),(0xA1A1);
SELECT hex(a) FROM t1 ORDER BY a;
hex(a)
A1A1
A3A0
DROP TABLE t1;

--- New file ---
+++ mysql-test/r/have_gbk.require	05/07/22 21:03:46
Collation	Charset	Id	Default	Compiled	Sortlen
gbk_chinese_ci	gbk	28	Yes	Yes	1

--- New file ---
+++ mysql-test/t/ctype_gbk.test	05/07/22 21:03:32
-- source include/have_gbk.inc

#
# Tests with the gbk character set
#
--disable_warnings
drop table if exists t1;
--enable_warnings

SET @test_character_set= 'gbk';
SET @test_collation= 'gbk_chinese_ci';
-- source include/ctype_common.inc

SET NAMES gbk;
SET collation_connection='gbk_chinese_ci';
-- source include/ctype_filesort.inc
-- source include/ctype_innodb_like.inc
SET collation_connection='gbk_bin';
-- source include/ctype_filesort.inc
-- source include/ctype_innodb_like.inc

#
# Bug#11987 mysql will truncate the text when
# the text contain GBK char:"0xA3A0" and "0xA1"
#
SET NAMES gbk;
CREATE TABLE t1 (a text) character set gbk;
INSERT INTO t1 VALUES (0xA3A0),(0xA1A1);
SELECT hex(a) FROM t1 ORDER BY a;
DROP TABLE t1;

Thread
bk commit into 4.1 tree (bar:1.2339) BUG#11987bar22 Jul