MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:ingo Date:September 7 2006 1:39pm
Subject:bk commit into 4.0 tree (istruewing:1.2184) BUG#14400
View as plain text  
Below is the list of changes that have just been committed into a local
4.0 repository of istruewing. When istruewing 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@stripped, 2006-09-07 15:39:31+02:00, istruewing@stripped +3 -0
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Additional fix for full keys and test case.

  myisam/mi_rkey.c@stripped, 2006-09-07 15:39:30+02:00, istruewing@stripped +22 -16
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional fix for full keys.

  mysql-test/r/myisam.result@stripped, 2006-09-07 15:39:30+02:00, istruewing@stripped +13 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional results.

  mysql-test/t/myisam.test@stripped, 2006-09-07 15:39:30+02:00, istruewing@stripped +18 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional test case.

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.0-bug14400

--- 1.15/myisam/mi_rkey.c	2006-09-07 15:39:33 +02:00
+++ 1.16/myisam/mi_rkey.c	2006-09-07 15:39:33 +02:00
@@ -78,25 +78,19 @@ int mi_rkey(MI_INFO *info, byte *buf, in
   if (!_mi_search(info,keyinfo, key_buff, use_key_length,
 		  myisam_read_vec[search_flag], info->s->state.key_root[inx]))
   {
-    if (info->lastpos >= info->state->data_file_length)
+    /*
+      If we searching for a partial key (or using >, >=, < or <=) and
+      the data is outside of the data file, we need to continue searching
+      for the first key inside the data file
+    */
+    if (info->lastpos >= info->state->data_file_length &&
+        (search_flag != HA_READ_KEY_EXACT ||
+         last_used_keyseg != keyinfo->seg + keyinfo->keysegs))
     {
       do
       {
         uint not_used;
         /*
-          If we are searching for an exact key, abort if we find a bigger
-          key.
-        */
-        if (search_flag == HA_READ_KEY_EXACT &&
-            (use_key_length == USE_WHOLE_KEY ||
-             _mi_key_cmp(keyinfo->seg, key_buff, info->lastkey, use_key_length,
-                         SEARCH_FIND, &not_used)))
-        {
-          my_errno= HA_ERR_END_OF_FILE;
-          info->lastpos= HA_OFFSET_ERROR;
-          break;
-        }
-        /*
           Skip rows that are inserted by other threads since we got a lock
           Note that this can only happen if we are not searching after an
           full length exact key, because the keys are sorted
@@ -107,8 +101,20 @@ int mi_rkey(MI_INFO *info, byte *buf, in
                              myisam_readnext_vec[search_flag],
                              info->s->state.key_root[inx]))
           break;
-      }
-      while (info->lastpos >= info->state->data_file_length);
+        /*
+          Check that the found key does still match the search.
+          _mi_search_next() delivers the next key regardless of its
+          value.
+        */
+        if (search_flag == HA_READ_KEY_EXACT &&
+            _mi_key_cmp(keyinfo->seg, key_buff, info->lastkey, use_key_length,
+                        SEARCH_FIND, &not_used))
+        {
+          my_errno= HA_ERR_KEY_NOT_FOUND;
+          info->lastpos= HA_OFFSET_ERROR;
+          break;
+        }
+      } while (info->lastpos >= info->state->data_file_length);
     }
   }
   if (share->concurrent_insert)

--- 1.32/mysql-test/r/myisam.result	2006-09-07 15:39:33 +02:00
+++ 1.33/mysql-test/r/myisam.result	2006-09-07 15:39:33 +02:00
@@ -487,3 +487,16 @@ a	a	b
 1	1	1
 2	2	1
 drop table t1,t2;
+CREATE TABLE t1 (c1 varchar(250) NOT NULL);
+CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));
+INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');
+INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');
+LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+t1c1	t2c1
+INSERT INTO t2 VALUES ('test000001'), ('test000005');
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+t1c1	t2c1
+DROP TABLE t1,t2;

--- 1.28/mysql-test/t/myisam.test	2006-09-07 15:39:33 +02:00
+++ 1.29/mysql-test/t/myisam.test	2006-09-07 15:39:33 +02:00
@@ -461,6 +461,7 @@ drop table t1;
 #
 # Bug #14400  Join could miss concurrently inserted row
 #
+# Partial key.
 create table t1 (a int not null, primary key(a));
 create table t2 (a int not null, b int not null, primary key(a,b));
 insert into t1 values (1),(2),(3),(4),(5),(6);
@@ -473,5 +474,22 @@ disconnect root;
 connection default;
 select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
 drop table t1,t2;
+#
+# Full key.
+CREATE TABLE t1 (c1 varchar(250) NOT NULL);
+CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));
+INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');
+INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');
+LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+connect (con1,localhost,root,,);
+connection con1;
+INSERT INTO t2 VALUES ('test000001'), ('test000005');
+disconnect con1;
+connection default;
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+DROP TABLE t1,t2;
 
 # end of 4.0 tests
Thread
bk commit into 4.0 tree (istruewing:1.2184) BUG#14400ingo7 Sep