bk commit into 4.1 tree (serg:1.2488) BUG#11336

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg 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.2488 05/12/18 13:30:01 serg@stripped +3 -0
  BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
  
  for uca collation isalnum and strnncollsp don't agree on whether
  0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
  
  they still don't, the bug was fixed by avoiding strnncollsp

  mysql-test/t/fulltext2.test
    1.12 05/12/18 13:29:47 serg@stripped +30 -0
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

  mysql-test/r/fulltext2.result
    1.10 05/12/18 13:29:47 serg@stripped +21 -0
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

  myisam/mi_delete.c
    1.33 05/12/18 13:29:47 serg@stripped +1 -1
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.32/myisam/mi_delete.c	Tue Oct 25 11:11:26 2005
+++ 1.33/myisam/mi_delete.c	Sun Dec 18 13:29:47 2005
@@ -157,7 +157,7 @@ static int _mi_ck_real_delete(register M
     goto err;
   }
   if ((error=d_search(info,keyinfo,
-                      (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND
+                      (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND | SEARCH_UPDATE
                                                    : SEARCH_SAME),
                        key,key_length,old_root,root_buff)) >0)
   {

--- 1.9/mysql-test/r/fulltext2.result	Fri Sep  3 22:04:02 2004
+++ 1.10/mysql-test/r/fulltext2.result	Sun Dec 18 13:29:47 2005
@@ -215,3 +215,24 @@ select count(*) from t1 where match a ag
 count(*)
 262
 drop table t1;
+set names utf8;
+create table t1(a text,fulltext(a)) collate=utf8_swedish_ci;
+insert into t1 values('test test '),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test');
+delete from t1 limit 1;
+drop table t1;
+set names latin1;

--- 1.11/mysql-test/t/fulltext2.test	Thu Jul 28 02:21:41 2005
+++ 1.12/mysql-test/t/fulltext2.test	Sun Dec 18 13:29:47 2005
@@ -179,7 +179,37 @@ update t1 set a='aaaxxx' where a = 'aaay
 select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
 select count(*) from t1 where match a against ('aaayyy' in boolean mode);
 select count(*) from t1 where match a against ('aaazzz' in boolean mode);
+drop table t1;
+
+#
+# BUG#11336
+#
+# for uca collation isalnum and strnncollsp don't agree on whether
+# 0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
+#
+# they still don't, the bug was fixed by avoiding strnncollsp
+#
 
+set names utf8;
+create table t1(a text,fulltext(a)) collate=utf8_swedish_ci;
+insert into t1 values('test test '),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
+('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test');
+delete from t1 limit 1;
 drop table t1;
+set names latin1;
 
 # End of 4.1 tests