[Commits] Rev 4171: MDEV-6185: Buildbot valgrind failure: Conditional jump or move in table_cond_selectivity in file:///home/psergey/dev2/10.0-look/

Sergey Petrunya psergey at askmonty.org
Tue Apr 29 17:33:19 EEST 2014


At file:///home/psergey/dev2/10.0-look/

------------------------------------------------------------
revno: 4171
revision-id: psergey at askmonty.org-20140429143317-tkmxrzu6y36hpi7t
parent: psergey at askmonty.org-20140425151206-7lmovg7fngdyjdsy
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 10.0-look
timestamp: Tue 2014-04-29 18:33:17 +0400
message:
  MDEV-6185: Buildbot valgrind failure: Conditional jump or move in table_cond_selectivity
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2014-04-25 15:04:54 +0000
+++ b/sql/sql_select.cc	2014-04-29 14:33:17 +0000
@@ -7342,8 +7342,11 @@ double table_cond_selectivity(JOIN *join
         */
         for (; quick_key_map & 1 ; quick_key_map>>= 1)
         {
-          while (keyuse->keypart == keyparts)
+          while (keyuse->table == table && keyuse->key == key && 
+                 keyuse->keypart == keyparts)
+          {
             keyuse++;
+          }
           keyparts++;
         }
         sel /= table->quick_rows[key] / table->stat_records();



More information about the commits mailing list