1. 21 Aug, 2013 3 commits
  2. 06 Aug, 2013 1 commit
  3. 05 Aug, 2013 1 commit
  4. 17 Jul, 2013 2 commits
  5. 16 Jul, 2013 9 commits
  6. 15 Jul, 2013 2 commits
  7. 11 Jul, 2013 2 commits
  8. 09 Jul, 2013 4 commits
    • Alexander Barkov's avatar
      Merge from 5.3 · c51ed128
      Alexander Barkov authored
      c51ed128
    • Vladislav Vaintroub's avatar
      MDEV-4409 - Fix deadlock in MySQL key cache code, that can happen if there is... · 6bef652d
      Vladislav Vaintroub authored
      MDEV-4409 - Fix deadlock in MySQL key cache code, that can happen if there is a key cache resize running in parallel with an update.
      
      If there is a key cache resize,a  thread writing to key cache, will pause waiting  until resize finishes. However this thread is won't be woken, because resize does not  signaling waiters anymore. This is a regression introduced in WL#86(segmented MyISAM key cache)
      The fix is to unconditionally release  threads waiting on resize_queue when resize  finishes, as in pre-WL#86 code.
      6bef652d
    • Alexander Barkov's avatar
      Merge from 5.2 · 8a732d5a
      Alexander Barkov authored
      modified:
        mysql-test/suite/plugins/r/fulltext_plugin.result
        mysql-test/suite/plugins/t/fulltext_plugin.test
        plugin/fulltext/plugin_example.c
        sql/sql_show.cc
      pending merges:
        Alexander Barkov 2013-07-09 [merge] Merge from 5.1
          Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninst...
          Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
      8a732d5a
    • Alexander Barkov's avatar
      Merge from 5.1 · 762d3cb8
      Alexander Barkov authored
      modified:
        mysql-test/suite/plugins/r/fulltext_plugin.result
        mysql-test/suite/plugins/t/fulltext_plugin.test
        plugin/fulltext/plugin_example.c
        sql/sql_show.cc
      pending merges:
        Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninstall ...
          Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
      762d3cb8
  9. 08 Jul, 2013 1 commit
    • Alexander Barkov's avatar
      Merging from 5.3 · 1f3ec980
      Alexander Barkov authored
      modified:
        include/my_time.h
        libmysql/libmysql.c
        mysql-test/r/adddate_454.result
        mysql-test/r/cast.result
        mysql-test/r/date_formats.result
        mysql-test/r/func_sapdb.result
        mysql-test/r/func_time.result
        mysql-test/r/mdev316.result
        mysql-test/r/parser.result
        mysql-test/r/partition_datatype.result
        mysql-test/r/partition_pruning.result
        mysql-test/r/type_date.result
        mysql-test/r/type_datetime.result
        mysql-test/suite/vcol/r/vcol_misc.result
        mysql-test/t/cast.test
        sql-common/my_time.c
        sql/field.cc
        sql/field_conv.cc
        sql/filesort.cc
        sql/item.cc
        sql/item.h
        sql/item_cmpfunc.cc
        sql/item_func.cc
        sql/item_strfunc.cc
        sql/item_timefunc.cc
        sql/sql_time.cc
      pending merges:
        Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
      1f3ec980
  10. 06 Jul, 2013 1 commit
  11. 05 Jul, 2013 3 commits
  12. 04 Jul, 2013 1 commit
  13. 03 Jul, 2013 1 commit
  14. 01 Jul, 2013 3 commits
  15. 28 Jun, 2013 4 commits
    • Alexander Barkov's avatar
      Merge · a924e900
      Alexander Barkov authored
      pending merges:
        Alexander Barkov 2013-06-28 A clean-up for MDEV-4634
      a924e900
    • Alexander Barkov's avatar
      A clean-up for MDEV-4634 · cfae3065
      Alexander Barkov authored
      modified:
        sql/time.cc
      cfae3065
    • Alexander Barkov's avatar
      Merge from 5.3 · f13236be
      Alexander Barkov authored
      modified:
        mysql-test/r/type_date.result
        mysql-test/r/type_datetime.result
        mysql-test/r/type_time.result
        mysql-test/t/type_date.test
        mysql-test/t/type_datetime.test
        mysql-test/t/type_time.test
        sql/item_func.cc
        sql/item_timefunc.cc
        sql/sql_time.cc
        sql/sql_time.h
      pending merges:
        Alexander Barkov 2013-06-28 MDEV-4634 Crash in CONVERT_TZ
      f13236be
    • Alexander Barkov's avatar
      MDEV-4634 Crash in CONVERT_TZ · 0e44faf2
      Alexander Barkov authored
      Item_func_min_max::get_date() did not check the
      returned value against the fuzzy_date flags, so
      it could return a bad value to the caller that
      expects a good date (e.h. CONVERT_TZ).
      
      
      modified:
        mysql-test/r/type_date.result
        mysql-test/r/type_datetime.result
        mysql-test/r/type_time.result
        mysql-test/t/type_date.test
        mysql-test/t/type_datetime.test
        mysql-test/t/type_time.test
        sql/item_func.cc
        sql/item_timefunc.cc
        sql/mysql_priv.h
        sql/time.cc
      0e44faf2
  16. 27 Jun, 2013 1 commit
  17. 22 Jun, 2013 1 commit