1. 13 Mar, 2012 6 commits
  2. 11 Mar, 2012 2 commits
  3. 09 Mar, 2012 2 commits
  4. 08 Mar, 2012 1 commit
  5. 07 Mar, 2012 1 commit
    • Michael Widenius's avatar
      Upgraded sphinx to version 2.0.4 · d09db0cb
      Michael Widenius authored
      Fixed memory leaks and compiler warnings in ha_sphinx.cc
      Added HA_MUST_USE_TABLE_CONDITION_PUSHDOWN so that an engine can force index condition to be used
      
      mysql-test/suite/sphinx/sphinx.result:
        Added testing of pushdown conditions and sphinx status variables.
      mysql-test/suite/sphinx/sphinx.test:
        Added testing of pushdown conditions and sphinx status variables.
      mysql-test/suite/sphinx/suite.pm:
        Print version number if sphinx version is too old.
      sql/handler.h:
        Added HA_MUST_USE_TABLE_CONDITION_PUSHDOWN so that an engine can force index condition to be used
      sql/sql_base.cc:
        Added 'thd' argument to check_unused() to be able to set 'entry->in_use' if we call handler->extra().
        This was needed as sphinx (and possible other storage engines) assumes that 'in_use' is set if handler functions are called.
      sql/sql_select.cc:
        Test if handler is forcing pushdown condition to be used.
      storage/sphinx/ha_sphinx.cc:
        Updated to version 2.0.4
        Fixed memory leaks and compiler warnings.
      storage/sphinx/ha_sphinx.h:
        Updated to version 2.0.4
      storage/sphinx/snippets_udf.cc:
        Updated to version 2.0.4
      d09db0cb
  6. 06 Mar, 2012 3 commits
    • Sergei Golubchik's avatar
      5.3 merge · 3bdc5da7
      Sergei Golubchik authored
      3bdc5da7
    • Igor Babaev's avatar
      Merge. · c8037466
      Igor Babaev authored
      c8037466
    • Igor Babaev's avatar
      Fixed LP bug #946055. · 3412d35b
      Igor Babaev authored
      The function create_hj_key_for_table() that builds the descriptor of
      the hash join key to access a table of a materialized subquery must
      ignore any equi-join predicate depending on the tables not belonging
      to the subquery.
      3412d35b
  7. 05 Mar, 2012 7 commits
    • Sergei Golubchik's avatar
      compilation warning: unused variable · 5fc2ef65
      Sergei Golubchik authored
      5fc2ef65
    • Sergei Golubchik's avatar
      mdev-20: INSTALL PLUGIN SONAME · 26da2ff2
      Sergei Golubchik authored
      26da2ff2
    • Michael Widenius's avatar
      Automatic merge · 9ea7bac8
      Michael Widenius authored
      9ea7bac8
    • Michael Widenius's avatar
      Ensure that we mark all processed tables as 'properly closed'. · 5d06eb14
      Michael Widenius authored
      This is needed as last log entry may be a DDL that is not processed and then a table may be left in 'not properly closed state' even if information is correct in it.
      5d06eb14
    • Sergei Golubchik's avatar
      updates after writing https://kb.askmonty.org/en/mysql-test-auxiliary-files · 082bbe86
      Sergei Golubchik authored
      mysql-test/README.suites:
        removed. it was turned into a manual, eventually
      mysql-test/include/default_mysqld.cnf:
        use normal environment variables instead of magic @OPT.vardir
      mysql-test/lib/My/ConfigFactory.pm:
        use normal environment variables instead of magic @OPT.vardir
      mysql-test/mysql-test-run.pl:
        initialize environment variables before parsing the first my.cnf template - it may refer to them
      mysql-test/suite/sphinx/my.cnf:
        use normal environment variables instead of magic @OPT.vardir
      082bbe86
    • unknown's avatar
      Fix for LP BUG#944504 · 883f1dd6
      unknown authored
      Problem is that subquery execution can't be called during prepare/optimize phase.
      
      Also small fix for subquery test suite.
      883f1dd6
    • Igor Babaev's avatar
      Fixed LP bug #944782. · d8438ef7
      Igor Babaev authored
      This bug in the function JOIN::drop_unused_derived_keys() could
      leave the internal structures for a materialized derived table
      in an inconsistent state. This led to a not quite correct EXPLAIN
      output when no additional key had been created to access the table.
      It also may lead to more serious consequences: so, the test case
      added with this fix caused a crash in mariadb-5.5.20.  
      d8438ef7
  8. 03 Mar, 2012 3 commits
  9. 02 Mar, 2012 3 commits
  10. 01 Mar, 2012 6 commits
    • Igor Babaev's avatar
      Merge 5.3->5.5. · fc74170a
      Igor Babaev authored
      fc74170a
    • Sergei Golubchik's avatar
      misc test/result fixes · 90696456
      Sergei Golubchik authored
      mysql-test/include/have_xtradb.combinations:
        xtradb tests need this I_S table
      mysql-test/lib/mtr_cases.pm:
        fix for .deb and .rpm installations
      90696456
    • unknown's avatar
      824f8e69
    • unknown's avatar
      Small cleanups: · a869435d
      unknown authored
       - use thd->in_active_multi_stmt_transaction() for
         @@in_transaction, not THD flag directly
       - use common error_if_in_trans_or_substatement() function for
         all 4 binlog variables that cannot be changed inside
         statement or transaction.
      a869435d
    • unknown's avatar
      c83077c6
    • Igor Babaev's avatar
      Fixed LP bug #943543. · 84575fc4
      Igor Babaev authored
      This bug appeared after the patch for bug 939009 that in the
      function merge_key_fields forgot to reset a proper value for
      the val field in the result of the merge operation of the key
      field created for a regular key access and  the key field
      created to look for a NULL key.
      
      Adjusted the results of the test case for bug 939009 that
      actually were incorrect. 
      84575fc4
  11. 29 Feb, 2012 3 commits
  12. 28 Feb, 2012 3 commits
    • Michael Widenius's avatar
      Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable... · d8038704
      Michael Widenius authored
      Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table"
      Fixed wrong mutex order bug in Aria when flush_log_for_bitmap() was called when table is not yet marked for change.
      
      include/my_base.h:
        Added flag that table is opened only for status
      mysql-test/r/myisam-big.result:
        Test case for lp:925377
      mysql-test/t/myisam-big.test:
        Test case for lp:925377
      sql/sql_base.cc:
        If thd->version == 0 (happens only when we are opening a table that is flushed under  MYSQL_LOCK_IGNORE_FLUSH), open the table in HA_OPEN_FOR_STATUS mode
      storage/maria/ma_bitmap.c:
        Fixed wrong mutex order bug in Aria when flush_log_for_bitmap() was called when table is not yet marked for change.
      storage/maria/ma_dbug.c:
        Ignore last_version <= 1 as these are either flushed or only opened for status
      storage/maria/ma_open.c:
        Use last_version=1 as a marker that table was opened with HA_OPEN_FOR_STATUS.
        In this case we just open a new version of the table in read only mode.
      storage/myisam/mi_create.c:
        Update prototype
      storage/myisam/mi_dbug.c:
        Ignore last_version <= 1 as these are either flushed or only opened for status
      storage/myisam/mi_open.c:
        Use last_version=1 as a marker that table was opened with HA_OPEN_FOR_STATUS.
        If HA_OPEN_FOR_STATUS is used, we will not assert if there is an old not-to-be-used version of the table existing.
        In this case we just open a new version of the table in read only mode.
      storage/myisam/myisamdef.h:
        Updated prototype
      d8038704
    • Igor Babaev's avatar
      Addressed all review feedbacks for mwl #247. · 8a9a7efd
      Igor Babaev authored
      8a9a7efd
    • Vladislav Vaintroub's avatar
      Update copyright notices · e8ab8ba0
      Vladislav Vaintroub authored
      e8ab8ba0