[Commits] Rev 3164: Merge MySQL 5.1.66 -> MariaDB 5.1.65 in file:///home/tsk/mprog/src/5.1-merge/

timour at askmonty.org timour at askmonty.org
Fri Nov 2 10:03:40 EET 2012


At file:///home/tsk/mprog/src/5.1-merge/

------------------------------------------------------------
revno: 3164 [merge]
revision-id: timour at askmonty.org-20121102080320-pgzavnzexi290c4m
parent: knielsen at knielsen-hq.org-20121101152009-xxomgrzoogy2lq5w
parent: annamalai.gurusami at oracle.com-20120712111207-wj9kvlysg1yeafny
committer: timour at askmonty.org
branch nick: 5.1-merge
timestamp: Fri 2012-11-02 10:03:20 +0200
message:
  Merge MySQL 5.1.66 -> MariaDB 5.1.65
  
  (step 1)
modified:
  configure.in                   sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
  sql/handler.cc                 sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
-------------- next part --------------
=== modified file 'configure.in'
--- a/configure.in	2012-08-22 09:40:39 +0000
+++ b/configure.in	2012-11-02 08:03:20 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MariaDB Server], [5.1.65-MariaDB], [], [mysql])
+AC_INIT([MariaDB Server], [5.1.66-MariaDB], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2012-08-22 09:40:39 +0000
+++ b/sql/handler.cc	2012-11-02 08:03:20 +0000
@@ -4352,7 +4352,19 @@ int handler::read_range_first(const key_
                 ? HA_ERR_END_OF_FILE
                 : result);
 
-  DBUG_RETURN (compare_key(end_range) <= 0 ? 0 : HA_ERR_END_OF_FILE);
+  if (compare_key(end_range) <= 0)
+  {
+    DBUG_RETURN(0);
+  }
+  else
+  {
+    /*
+      The last read row does not fall in the range. So request
+      storage engine to release row lock if possible.
+    */
+    unlock_row();
+    DBUG_RETURN(HA_ERR_END_OF_FILE);
+  }
 }
 
 
@@ -4384,7 +4396,20 @@ int handler::read_range_next()
   result= index_next(table->record[0]);
   if (result)
     DBUG_RETURN(result);
-  DBUG_RETURN(compare_key(end_range) <= 0 ? 0 : HA_ERR_END_OF_FILE);
+
+  if (compare_key(end_range) <= 0)
+  {
+    DBUG_RETURN(0);
+  }
+  else
+  {
+    /*
+      The last read row does not fall in the range. So request
+      storage engine to release row lock if possible.
+    */
+    unlock_row();
+    DBUG_RETURN(HA_ERR_END_OF_FILE);
+  }
 }
 
 



More information about the commits mailing list