1. 24 Feb, 2012 1 commit
  2. 23 Feb, 2012 3 commits
    • Michael Widenius's avatar
      Automatic merge · 6e1dac8f
      Michael Widenius authored
      6e1dac8f
    • Michael Widenius's avatar
      Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1 · d395d251
      Michael Widenius authored
      
      BUILD/SETUP.sh:
        By default, build also with innodb-plugin
      mysql-test/mysql-test-run.pl:
        Also search in lib64 directory for plugins (This is used at least on OpenSuse 12.1 when using default build scripts)
      mysql-test/r/lock_multi.result:
        Allow test to be re-run even if it crashed.
      mysql-test/t/lock_multi.test:
        Allow test to be re-run even if it crashed.
      scripts/make_binary_distribution.sh:
        Ensure that libexecdir is named libexec (was not on OpenSuse 12.1)
      scripts/mysql_config.sh:
        Fixed detection of lib64 was used.
      d395d251
    • Michael Widenius's avatar
      Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_open_tables_state. · 2b625ac3
      Michael Widenius authored
      This also fixes a (not likely) crashing bug when forcing a thread that was doing a table lock to re-open it's files, for example by creating a trigger.
      
      
      mysys/thr_lock.c:
        Added more checking to find wrong locks.
        Removed one, not needed, parameter to thr_lock
      sql/lock.cc:
        Fixed mysql_lock_tables() to retry with new sql_lock if lock fails. This was needed as table may be closed and reopened between retry's and then the old sql_lock will point to stale data.
      sql/mysql_priv.h:
        Updated prototype
      sql/sql_base.cc:
        Ensure that all tables are closed if opening of system table failes; This fixes the assert in THD::restore_backup_open_tables_state
      sql/sql_handler.cc:
        Updated variable type
      2b625ac3
  3. 22 Feb, 2012 4 commits
  4. 21 Feb, 2012 6 commits
  5. 20 Feb, 2012 6 commits
  6. 21 Feb, 2012 3 commits
  7. 20 Feb, 2012 12 commits
  8. 19 Feb, 2012 2 commits
    • Igor Babaev's avatar
      Fixed bug #934348. · 3ef46370
      Igor Babaev authored
      This bug is the result of an incomplete/inconsistent change introduced into
      5.3 code when the cond_equal parameter were added to the function optimize_cond.
      The change was made during a merge from 5.2 in October 2010.
      The bug could affect only queries with HAVING.
      3ef46370
    • Igor Babaev's avatar
      Fixed LP bug #934342. · cd81f578
      Igor Babaev authored
      An outer join query with a semi-join subquery could return a wrong result
      if the optimizer chose to materialize the subquery.
      It happened because when substituting for the best field into a ref item
      used to build access keys not all COND_EQUAL objects that could be employed
      at substitution were checked.
      
      Also refined some code in the function check_join_cache_usage to make it
      safer. 
      cd81f578
  9. 17 Feb, 2012 3 commits
    • Sergei Golubchik's avatar
      Remove engine-specific (but identical) icp callbacks. create one reusable · bbb35276
      Sergei Golubchik authored
      common icp callback in the handler.cc.
      
      It can also increment status counters, without making the engine
      dependent on the exact THD layout (that is different in embedded).
      bbb35276
    • Igor Babaev's avatar
      Fixed LP bug #928352. · 2d19b077
      Igor Babaev authored
      This bug led to wrong values of the use_count fields in some SEL_ARG
      trees that triggered complains on the server side when executing the
      test case for LP bug 800184 if a debug build of the server was used.
        
      This was the result of the incomplete fix for bug 800184.
      To complete it the following corrections had to be made:
      - the copy constructor for SEL_TREE must call the new function incr_refs_all()
        instead of the function incr_refs(), because references to next key parts
        from any SEL_ARG tree belonging to the list of the first key part has to be
        adjusted.
      - the method and_sel_tree of the class SEL_IMERGE must use the copy constructor
        of the SEL_TREE class to make a copy of its second argument before it ANDs it
        with any SEL_TREE tree from the processed SEL_IMERGE object.  
         
      
      
      2d19b077
    • Igor Babaev's avatar
      Fixed LP bug #933117. · c563ea07
      Igor Babaev authored
      The bug was fixed with the code back-ported from the patch for LP bug 800184
      pushed into mariadb-5.3.
      c563ea07