1. 14 Apr, 2012 1 commit
  2. 13 Apr, 2012 1 commit
  3. 11 Apr, 2012 2 commits
  4. 10 Apr, 2012 2 commits
  5. 07 Apr, 2012 2 commits
    • Sergei Golubchik's avatar
      merge · 0ca27951
      Sergei Golubchik authored
      0ca27951
    • Igor Babaev's avatar
      Fixed LP bug #972973. · 00052d8a
      Igor Babaev authored
      When the function free_tmp_table deletes the handler object for
      a temporary table the field TABLE::file for this table should be
      set to NULL. Otherwise an assertion failure may occur.
      00052d8a
  6. 06 Apr, 2012 6 commits
  7. 05 Apr, 2012 5 commits
    • Sergei Golubchik's avatar
      merge · 7a5d4701
      Sergei Golubchik authored
      7a5d4701
    • unknown's avatar
      Fix of LP bug#968720. · 66d00989
      unknown authored
      When a view/derived table is converted from merged to materialized the
      items from the used_item lists are substituted for items referring to
      the fields of the result of the materialization. The problem appeared
      with queries employing natural joins. Since the resolution of a natural
      join was performed only once the used_item list formed at the second
      execution of the query lacked the references to the fields that were
      used only in the equality predicates generated for the natural join.
      66d00989
    • Sergei Golubchik's avatar
      f063e6e6
    • Sergei Golubchik's avatar
      merge · 8a153048
      Sergei Golubchik authored
      8a153048
    • Sergei Golubchik's avatar
      mysql-5.1.62 merge · d4b30a7a
      Sergei Golubchik authored
      d4b30a7a
  8. 04 Apr, 2012 8 commits
  9. 03 Apr, 2012 7 commits
  10. 02 Apr, 2012 6 commits
    • Sergey Petrunya's avatar
      Merge · f92aa868
      Sergey Petrunya authored
      f92aa868
    • Sergey Petrunya's avatar
      BUG#913030: Optimizer chooses a suboptimal excution plan for Q18 from DBT-3 · 69207673
      Sergey Petrunya authored
      - When doing join optimization, pre-sort the tables so that they mimic the execution
        order we've had with 'semijoin=off'. 
      - That way, we will not get regressions when there are two query plans (the old and the
        new) that have indentical costs but different execution times (because of factors that
        the optimizer was not able to take into account).
        
      69207673
    • Sergei Golubchik's avatar
      merge · 1f99b474
      Sergei Golubchik authored
      1f99b474
    • Sergei Golubchik's avatar
      merge · 3d2b0eed
      Sergei Golubchik authored
      3d2b0eed
    • Michael Widenius's avatar
      Merge of compatibility fixes · 8344a770
      Michael Widenius authored
      Fixed failing tests in sys_vars as we have now stricter checking of setting of variables.
      
      mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysys/my_getsystime.c:
        Merge + fixed bug that __NR_clock_gettime didn't work in 5.5
      8344a770
    • Michael Widenius's avatar
      automatic merge · c94d93e3
      Michael Widenius authored
      c94d93e3