1. 10 Apr, 2012 2 commits
  2. 07 Apr, 2012 2 commits
    • Sergei Golubchik's avatar
      merge · f860b2aa
      Sergei Golubchik authored
      f860b2aa
    • Igor Babaev's avatar
      Fixed LP bug #972973. · b95ae56b
      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.
      b95ae56b
  3. 06 Apr, 2012 6 commits
  4. 05 Apr, 2012 5 commits
    • Sergei Golubchik's avatar
      merge · a3073ecd
      Sergei Golubchik authored
      a3073ecd
    • unknown's avatar
      Fix of LP bug#968720. · 1a489190
      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.
      1a489190
    • Sergei Golubchik's avatar
      b4349462
    • Sergei Golubchik's avatar
      merge · cbd52a42
      Sergei Golubchik authored
      cbd52a42
    • Sergei Golubchik's avatar
      mysql-5.1.62 merge · dea3544b
      Sergei Golubchik authored
      dea3544b
  5. 04 Apr, 2012 8 commits
  6. 03 Apr, 2012 7 commits
  7. 02 Apr, 2012 10 commits
    • Sergey Petrunya's avatar
      Merge · d734a13d
      Sergey Petrunya authored
      d734a13d
    • Sergey Petrunya's avatar
      BUG#913030: Optimizer chooses a suboptimal excution plan for Q18 from DBT-3 · 2a16e767
      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).
        
      2a16e767
    • Sergei Golubchik's avatar
      merge · 97a3baef
      Sergei Golubchik authored
      97a3baef
    • Sergei Golubchik's avatar
      merge · 1c6d95f3
      Sergei Golubchik authored
      1c6d95f3
    • Michael Widenius's avatar
      Merge of compatibility fixes · d513153f
      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
      d513153f
    • Michael Widenius's avatar
      automatic merge · 635598f1
      Michael Widenius authored
      635598f1
    • Michael Widenius's avatar
    • Sergei Golubchik's avatar
    • Michael Widenius's avatar
      automatic merge · ca28d5fc
      Michael Widenius authored
      ca28d5fc
    • Michael Widenius's avatar
      Fixed lp:886484 "nowatch option for mysqld (allow systemd)" · 2887bfbe
      Michael Widenius authored
      Added a --nowatch (with aliases --no-watch and --no-auto-restart) option to mysqld_safe that causes it to exit after
      spawning mysqld.  We don't need mysqld_safe to restart mysqld after a crash, because systemd can do that just fine.
      
      Based on code from Maarten Vanraes
      
      scripts/mysqld_safe.sh:
        Added option --nowatch (with aliases --no-watch and --no-auto-restart)
      2887bfbe