[Commits] Rev 2936: Merge: fix valgrind failure in Unique class in file:///home/psergey/dev2/5.1-merge/

Sergey Petrunya psergey at askmonty.org
Tue Sep 14 20:29:17 EEST 2010


At file:///home/psergey/dev2/5.1-merge/

------------------------------------------------------------
revno: 2936 [merge]
revision-id: psergey at askmonty.org-20100914172915-2tga1mh3t745fx3y
parent: sergii at pisem.net-20100914112914-1hyjhmxo2sk2i5uf
parent: psergey at askmonty.org-20100914164851-9117egt4wwo366ww
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 5.1-merge
timestamp: Tue 2010-09-14 21:29:15 +0400
message:
  Merge: fix valgrind failure in Unique class
modified:
  sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2010-08-27 14:12:44 +0000
+++ b/sql/sql_class.h	2010-09-14 16:48:51 +0000
@@ -2990,7 +2990,7 @@
                                             ulonglong max_in_memory_size)
   {
     register ulonglong max_elems_in_tree=
-      (1 + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));
+      max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size);
     return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree));
   }
 



More information about the commits mailing list