[Commits] Rev 3679: Automatic merge in file:///home/bell/maria/bzr/work-maria-10.0-base-merge-5.5/

sanja at montyprogram.com sanja at montyprogram.com
Mon Aug 19 12:59:28 EEST 2013


At file:///home/bell/maria/bzr/work-maria-10.0-base-merge-5.5/

------------------------------------------------------------
revno: 3679 [merge]
revision-id: psergey at askmonty.org-20130731093701-8qn9ow5yz3480mqu
parent: wlad at montyprogram.com-20130729140341-xb10d3gw1foqx6f3
parent: psergey at askmonty.org-20130725184226-82igca7xm0xsogrc
author: Sergey Petrunya <psergey at askmonty.org>
committer: sanja at montyprogram.com
branch nick: 5.5-push
timestamp: Wed 2013-07-31 13:37:01 +0400
message:
  Automatic merge
modified:
  storage/maria/ma_range.c       sp1f-ma_range.c-20060411134429-lrowd7ifuztes43ceqjxqzn3cjqlynu4
-------------- next part --------------
=== modified file 'storage/maria/ma_range.c'
--- a/storage/maria/ma_range.c	2011-07-13 19:10:18 +0000
+++ b/storage/maria/ma_range.c	2013-07-25 18:42:26 +0000
@@ -144,6 +144,10 @@ static ha_rows _ma_record_pos(MARIA_HA *
 		       (HA_KEYSEG**) 0);
   DBUG_EXECUTE("key", _ma_print_key(DBUG_FILE, &key););
   nextflag=maria_read_vec[search_flag];
+  
+  /* Indicate if we're doing a search on a key prefix */
+  if (((((key_part_map)1) << key.keyinfo->keysegs) - 1) != keypart_map)
+    nextflag |= SEARCH_PART_KEY;
 
   /*
     my_handler.c:ha_compare_text() has a flag 'skip_end_space'.



More information about the commits mailing list