1. 11 May, 2012 1 commit
  2. 21 May, 2012 2 commits
  3. 20 May, 2012 1 commit
  4. 18 May, 2012 10 commits
    • Michael Widenius's avatar
      Automatic merge · 5f7b9746
      Michael Widenius authored
      5f7b9746
    • Michael Widenius's avatar
      Fixed compile warnings · f9143686
      Michael Widenius authored
      Fixed some mtr test problems
      
      
      
      dbug/tests.c:
        Fixed compiler warnings
      mysql-test/r/handlersocket.result:
        Fixed that plugin_license is written
      mysql-test/suite/innodb/t/innodb_bug60196.test:
        Force sorted results as it was sometimes different on windows
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test:
        Prolong test as this failed on windows
      mysql-test/t/handlersocket.test:
        Fixed that plugin_license is written
      plugin/handler_socket/handlersocket/handlersocket.cpp:
        Use maria_declare_plugin
      plugin/handler_socket/handlersocket/mysql_incl.hpp:
        Fixed compiler warning
      plugin/handler_socket/libhsclient/auto_addrinfo.hpp:
        Fixed compiler warning
      sql/handler.h:
        Fixed typo
      sql/sql_plugin.cc:
        Fixed bug that caused plugin library name twice in error message
      storage/maria/ma_checkpoint.c:
        Fixed compiler warning
      storage/maria/ma_loghandler.c:
        Fixed compiler warning
      unittest/mysys/base64-t.c:
        Fixed compiler warning
      unittest/mysys/bitmap-t.c:
        Fixed compiler warning
      unittest/mysys/my_malloc-t.c:
        Fixed compiler warning
      f9143686
    • Michael Widenius's avatar
      Fixed lp:997460 Truncate table on partitioned Aria table fails with ER_ILLEGAL_HA · 88accb77
      Michael Widenius authored
      Fix is done by doing an autocommit in truncate table inside Aria
      
      storage/maria/ha_maria.cc:
        Force a commit for TRUNCATE TABLE inside lock tables
        Check that we don't call TRUNCATE with concurrent inserts going on.
        Make ha_maria::implict_commit faster when we don't have Aria tables in the transaction.
        (Most of the patch is just re-indentation because I removed an if level)
      88accb77
    • Sergey Petrunya's avatar
      Merge · 6ffb4b32
      Sergey Petrunya authored
      6ffb4b32
    • Sergey Petrunya's avatar
      BUG#1000269: Wrong result (extra rows) with semijoin+materialization, IN... · db14d8c6
      Sergey Petrunya authored
      BUG#1000269: Wrong result (extra rows) with semijoin+materialization, IN subqueries, join_cache_level>0
      - make make_cond_after_sjm() correctly handle OR clauses where one branch refers to the semi-join table
        while the other branch refers to the non-semijoin table.
      db14d8c6
    • Sergei Golubchik's avatar
      5.1 merge · 68a01085
      Sergei Golubchik authored
      68a01085
    • Vladislav Vaintroub's avatar
      55846ab7
    • Sergei Golubchik's avatar
      post-merge fixes · 414a966e
      Sergei Golubchik authored
      sql/slave.cc:
        add mutex protection, like in sql_parse.cc
      414a966e
    • Igor Babaev's avatar
      Asked for sorted result from a query. · cd5a8abf
      Igor Babaev authored
      cd5a8abf
    • Igor Babaev's avatar
  5. 17 May, 2012 7 commits
  6. 16 May, 2012 4 commits
    • Michael Widenius's avatar
      More fixes for LOCK TABLE and REPAIR/FLUSH · 598bb174
      Michael Widenius authored
      Changed HA_EXTRA_NORMAL to HA_EXTRA_NOT_USED (more clean)
      
      mysql-test/suite/maria/lock.result:
        More extensive tests of LOCK TABLE with FLUSH and REPAIR
      mysql-test/suite/maria/lock.test:
        More extensive tests of LOCK TABLE with FLUSH and REPAIR
      sql/sql_admin.cc:
        Fix that REPAIR TABLE ... USE_FRM works with LOCK TABLES
      sql/sql_base.cc:
        Ensure that transactions are closed in ARIA when doing flush
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
        Don't call extra many times for a table in close_all_tables_for_name()
        Added test if table_list->table as this can happen in error situations
      sql/sql_partition.cc:
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
      sql/sql_reload.cc:
        Fixed comment
      sql/sql_table.cc:
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
      sql/sql_trigger.cc:
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
      sql/sql_truncate.cc:
        HA_EXTRA_FORCE_REOPEN -> HA_EXTRA_PREPARE_FOR_DROP for truncate, as this speeds up truncate by not having to flush the cache to disk.
      598bb174
    • Michael Widenius's avatar
      Fixed LP:990187 Assertion `share->reopen == 1' failed at maria_extra on ADD PARTITION · 73fdf95b
      Michael Widenius authored
      
      mysql-test/suite/maria/maria-partitioning.result:
        New test case
      mysql-test/suite/maria/maria-partitioning.test:
        New test case
      sql/sql_base.cc:
        Ignore HA_EXTRA_NORMAL for wait_while_table_is_used()
        More DBUG
      sql/sql_partition.cc:
        Don't use HA_EXTRA_FORCE_REOPEN for wait_while_table_is_used() as the table is opened multiple times (in prep_alter_part_table)
        This fixes the assert in Aria where we check if table is opened multiple times if HA_EXTRA_FORCE_REOPEN is issued
      73fdf95b
    • Michael Widenius's avatar
      Moved maria tests to suite/maria · 1994d9ce
      Michael Widenius authored
      1994d9ce
    • Michael Widenius's avatar
      Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close... · 91bf357b
      Michael Widenius authored
      Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK
      - 5.5 was missing calls to ha_extra(HA_PREPARE_FOR_DROP | HA_PREPARE_FOR_RENAME);  Lost in merge 5.3 -> 5.5
      
      
      sql/sql_admin.cc:
        Updated arguments for close_all_tables_for_name
      sql/sql_base.h:
        Updated arguments for close_all_tables_for_name
      sql/sql_partition.cc:
        Updated arguments for close_all_tables_for_name
      sql/sql_table.cc:
        Updated arguments for close_all_tables_for_name
        Removed test of kill, as we have already called 'ha_extra(HA_PREPARE_FOR_DROP)' and the table may be inconsistent.
      sql/sql_trigger.cc:
        Updated arguments for close_all_tables_for_name
      sql/sql_truncate.cc:
        For truncate that is done with drop + recreate, signal that the table will be dropped.
      91bf357b
  7. 15 May, 2012 2 commits
    • Sergei Golubchik's avatar
      Added --continue-on-error to mysqltest and mysql-test-run · 9e30410b
      Sergei Golubchik authored
      This will contune the test case even if there was an error
      and makes it easier to run a test that contains many sub tests against one engine.
      
      (originally by Monty)
      9e30410b
    • unknown's avatar
      Fix for LP bug#998516 · 17e199af
      unknown authored
      If we did nothing in resolving unique table conflict we should not retry (it leed to infinite loop).
      Now we retry (recheck) unique table check only in case if we materialized a table.
      17e199af
  8. 13 May, 2012 1 commit
    • Sergey Petrunya's avatar
      BUG#998236: Assertion failure or valgrind errors at best_access_path ... · 05a0d97e
      Sergey Petrunya authored
      - Let fix_semijoin_strategies_for_picked_join_order() set 
        POSITION::prefix_record_count for POSITION records that it copies from
        SJ_MATERIALIZATION_INFO::tables. 
        (These records do not have prefix_record_count set, because they are optimized
         as joins-inside-semijoin-nests, without full advance_sj_state() processing).  
       
      05a0d97e
  9. 12 May, 2012 3 commits
  10. 11 May, 2012 2 commits
    • unknown's avatar
      Merge 5.2->5.3 · c27552a4
      unknown authored
      c27552a4
    • unknown's avatar
      fix for LP bug#994392 · c9e3bf74
      unknown authored
      The not_null_tables() of Item_func_not_all and Item_in_optimizer was inherited from
      Item_func by mistake. It made the optimizer think that  subquery
      predicates with ALL/ANY/IN were null-rejecting. This could trigger invalid
      conversions of outer joins into inner joins.
      c9e3bf74
  11. 10 May, 2012 1 commit
  12. 08 May, 2012 4 commits
  13. 07 May, 2012 2 commits