MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:ingo Date:August 29 2006 6:45pm
Subject:bk commit into 4.0 tree (istruewing:1.2183) 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-08-29 20:45:04+02:00, istruewing@stripped +3 -0
  Bug#14400 - Query joins wrong rows from table which is
              subject of "concurrent insert"
  Better fix by Monty: "The previous bug fix didn't work
  when using partial keys."

  myisam/mi_rkey.c@stripped, 2006-08-29 20:45:03+02:00, istruewing@stripped +31 -12
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Better fix by Monty: "The previous bug fix didn't work
    when using partial keys."

  mysql-test/r/myisam.result@stripped, 2006-08-29 20:45:03+02:00, istruewing@stripped +15 -0
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Added test result

  mysql-test/t/myisam.test@stripped, 2006-08-29 20:45:03+02:00, istruewing@stripped +17 -0
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Added 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.14/myisam/mi_rkey.c	2006-08-29 20:45:06 +02:00
+++ 1.15/myisam/mi_rkey.c	2006-08-29 20:45:06 +02:00
@@ -66,6 +66,7 @@ int mi_rkey(MI_INFO *info, byte *buf, in
 
   if (fast_mi_readinfo(info))
     goto err;
+
   if (share->concurrent_insert)
     rw_rdlock(&share->key_root_lock[inx]);
 
@@ -77,19 +78,37 @@ 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]))
   {
-    while (info->lastpos >= info->state->data_file_length)
+    if (info->lastpos >= info->state->data_file_length)
     {
-      /*
-	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
-	exact key, because the keys are sorted according to position
-      */
-
-      if  (_mi_search_next(info, keyinfo, info->lastkey,
-			   info->lastkey_length,
-			   myisam_readnext_vec[search_flag],
-			   info->s->state.key_root[inx]))
-	break;
+      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
+          according to position
+        */
+        if  (_mi_search_next(info, keyinfo, info->lastkey,
+                             info->lastkey_length,
+                             myisam_readnext_vec[search_flag],
+                             info->s->state.key_root[inx]))
+          break;
+      }
+      while (info->lastpos >= info->state->data_file_length);
     }
   }
   if (share->concurrent_insert)

--- 1.31/mysql-test/r/myisam.result	2006-08-29 20:45:06 +02:00
+++ 1.32/mysql-test/r/myisam.result	2006-08-29 20:45:06 +02:00
@@ -472,3 +472,18 @@ select c1 from t1 order by c1 limit 1;
 c1
 a
 drop table t1;
+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);
+insert into t2 values (1,1),(2,1);
+lock tables t1 read local, t2 read local;
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+a	a	b
+1	1	1
+2	2	1
+insert into t2 values(2,0);
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+a	a	b
+1	1	1
+2	2	1
+drop table t1,t2;

--- 1.27/mysql-test/t/myisam.test	2006-08-29 20:45:06 +02:00
+++ 1.28/mysql-test/t/myisam.test	2006-08-29 20:45:06 +02:00
@@ -458,3 +458,20 @@ insert into t1 values ('a'), ('b');
 select c1 from t1 order by c1 limit 1;
 drop table t1;
 
+#
+# Bug #14400  Join could miss concurrently inserted row
+#
+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);
+insert into t2 values (1,1),(2,1);
+lock tables t1 read local, t2 read local;
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+insert into t2 values(2,0);
+disconnect root;
+connection default;
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+drop table t1,t2;
+
+# end of 4.0 tests
Thread
bk commit into 4.0 tree (istruewing:1.2183) BUG#14400ingo29 Aug