MDEV-6185: Buildbot valgrind failure: Conditional jump or move in table_cond_selectivity

32392c05 · Sergey Petrunya · 54265c5f · 32392c05
Commit 32392c05 authored Apr 29, 2014 by Sergey Petrunya
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

sql/sql_select.cc sql/sql_select.cc +4 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -7342,8 +7342,11 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s,
        */
        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();