bk commit into 5.0 tree (svoj:1.2126) BUG#12873

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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.2126 06/05/11 21:15:37 svoj@april.(none) +3 -0
  BUG#12873 - BTREE index on MEMORY table with multiple NULL values
              doesn't work properly
  
  Unique BTREE index on MEMORY table refuse multiple NULL values.
  
  Fixed search_flag to allow multiple null values inside unique key.

  mysql-test/t/heap_btree.test
    1.17 06/05/11 21:15:33 svoj@april.(none) +8 -0
    Testcase for BUG#12873.

  mysql-test/r/heap_btree.result
    1.20 06/05/11 21:15:33 svoj@april.(none) +3 -0
    Testcase for BUG#12873.

  heap/hp_write.c
    1.23 06/05/11 21:15:33 svoj@april.(none) +1 -1
    Fixed search_flag to allow multiple null values inside unique key.

# 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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG12873/mysql-5.0

--- 1.22/heap/hp_write.c	2005-01-15 14:37:11 +04:00
+++ 1.23/heap/hp_write.c	2006-05-11 21:15:33 +05:00
@@ -105,7 +105,7 @@
   custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);
   if (keyinfo->flag & HA_NOSAME)
   {
-    custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME | SEARCH_UPDATE;
+    custom_arg.search_flag= SEARCH_FIND | SEARCH_UPDATE;
     keyinfo->rb_tree.flag= TREE_NO_DUPS;
   }
   else

--- 1.19/mysql-test/r/heap_btree.result	2006-04-19 15:13:45 +05:00
+++ 1.20/mysql-test/r/heap_btree.result	2006-05-11 21:15:33 +05:00
@@ -256,3 +256,6 @@
 INDEX_LENGTH
 21
 DROP TABLE t1;
+CREATE TABLE t1 (a INT, UNIQUE USING BTREE(a)) ENGINE=MEMORY;
+INSERT INTO t1 VALUES(NULL),(NULL);
+DROP TABLE t1;

--- 1.16/mysql-test/t/heap_btree.test	2006-05-04 15:52:05 +05:00
+++ 1.17/mysql-test/t/heap_btree.test	2006-05-11 21:15:33 +05:00
@@ -176,4 +176,12 @@
 SELECT INDEX_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='t1';
 DROP TABLE t1;
 
+#
+# BUG#12873 - BTREE index on MEMORY table with multiple NULL values doesn't
+# work properly
+#
+CREATE TABLE t1 (a INT, UNIQUE USING BTREE(a)) ENGINE=MEMORY;
+INSERT INTO t1 VALUES(NULL),(NULL);
+DROP TABLE t1;
+
 # End of 4.1 tests