1. 03 Jul, 2013 16 commits
  2. 02 Jul, 2013 3 commits
  3. 01 Jul, 2013 1 commit
  4. 27 Jun, 2013 4 commits
    • Michael Widenius's avatar
      Fixed some wrong format strings. · ecf9b1b7
      Michael Widenius authored
      Fixed OPTIMIZE with innodb
      
      
      include/my_sys.h:
        Removed ATTRIBUTE_FORMAT() as it gave warnings for %'s
      sql/log_event.cc:
        Optimization: 
        use my_b_write() and my_b_write_byte() instead of my_b_printf()
        use strmake() instead of my_snprintf()
      sql/sql_admin.cc:
        Fixed bug in admin_recreate_table()
        Fixed OPTIMIZE with innodb
      sql/sql_table.cc:
        Indentation fixes
      strings/my_vsnprintf.c:
        Changed fprintf() to fputs()
      ecf9b1b7
    • unknown's avatar
      merge of 2876.430.11 & 2876.430.1 · 70092601
      unknown authored
      CF_PREOPEN_TMP_TABLES & CF_HA_CLOSE & Patch for Bug#11746602 (27480: Extend CREATE TEMPORARY TABLES 
        privilege to allow temp table operations).
      70092601
    • Michael Widenius's avatar
      ha_partition.cc and ha_partition.h are now completely merged · 94d722b6
      Michael Widenius authored
      Added sql_mode_t to simplify merges
      94d722b6
    • unknown's avatar
      MDEV-4058 · ecbf36a9
      unknown authored
      MySQL 5.6.10 performance schema: merge of host_cache table
      ecbf36a9
  5. 26 Jun, 2013 2 commits
  6. 23 Jun, 2013 1 commit
  7. 22 Jun, 2013 1 commit
    • Michael Widenius's avatar
      Don't update table and index statics for temporary tables · 5f4e0e87
      Michael Widenius authored
      Fixed type and testing of last_update type for innodb_table_stats
      
      mysql-test/r/connect.result:
        Removed tables which are not created anymore
      sql/item_sum.h:
        Fixed typo
      sql/sql_base.cc:
        Don't update table and index statics for temporary tables
      sql/sys_vars.cc:
        Merge
      storage/innobase/dict/dict0stats.cc:
        Fixed type last_update to TIMESTAMP.
      5f4e0e87
  8. 21 Jun, 2013 1 commit
  9. 20 Jun, 2013 1 commit
  10. 19 Jun, 2013 2 commits
  11. 17 Jun, 2013 3 commits
  12. 16 Jun, 2013 1 commit
    • Michael Widenius's avatar
      More merge fixes: · 8075b05b
      Michael Widenius authored
      - mdl.cc and mdl.h merged completely
      - mysql_system_tables*.sql merged completely
      - Fixed wrong merge of lock_tables
      - Added some missing functions:
       - bool THD::notify_shared_lock()
       - Dynamic_array::pop, Dynamic_array::del
      - Added MDL_context_owner to THD
      - Added metadata_locks_hash_instances
      8075b05b
  13. 15 Jun, 2013 2 commits
  14. 21 May, 2013 1 commit
  15. 25 Mar, 2013 1 commit