1. 18 May, 2012 8 commits
    • Igor Babaev's avatar
      Merge. · 44f5c1a8
      Igor Babaev authored
      44f5c1a8
    • Igor Babaev's avatar
      Merge. · d48b4a83
      Igor Babaev authored
      d48b4a83
    • Michael Widenius's avatar
      Automatic merge · 3f4ef592
      Michael Widenius authored
      3f4ef592
    • Michael Widenius's avatar
      Fixed compile warnings · 960f6600
      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
      960f6600
    • Michael Widenius's avatar
      Fixed lp:997460 Truncate table on partitioned Aria table fails with ER_ILLEGAL_HA · d4d3ca20
      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)
      d4d3ca20
    • Vladislav Vaintroub's avatar
      32498ead
    • Igor Babaev's avatar
      Asked for sorted result from a query. · 277f7a92
      Igor Babaev authored
      277f7a92
    • Igor Babaev's avatar
  2. 17 May, 2012 5 commits
  3. 16 May, 2012 4 commits
    • Michael Widenius's avatar
      More fixes for LOCK TABLE and REPAIR/FLUSH · b1485a47
      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.
      b1485a47
    • Michael Widenius's avatar
      Fixed LP:990187 Assertion `share->reopen == 1' failed at maria_extra on ADD PARTITION · 26cc22f3
      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
      26cc22f3
    • Michael Widenius's avatar
      Moved maria tests to suite/maria · c39da19c
      Michael Widenius authored
      c39da19c
    • Michael Widenius's avatar
      Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close... · 6d8e329c
      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.
      6d8e329c
  4. 15 May, 2012 1 commit
  5. 08 May, 2012 2 commits
  6. 07 May, 2012 3 commits
  7. 05 May, 2012 4 commits
  8. 04 May, 2012 5 commits
  9. 03 May, 2012 3 commits
  10. 02 May, 2012 1 commit
  11. 03 May, 2012 1 commit
  12. 02 May, 2012 3 commits