1. 05 Apr, 2012 4 commits
    • Sergei Golubchik's avatar
      merge · a3073ecd
      Sergei Golubchik authored
      a3073ecd
    • unknown's avatar
      Fix of LP bug#968720. · 1a489190
      unknown authored
      When a view/derived table is converted from merged to materialized the
      items from the used_item lists are substituted for items referring to
      the fields of the result of the materialization. The problem appeared
      with queries employing natural joins. Since the resolution of a natural
      join was performed only once the used_item list formed at the second
      execution of the query lacked the references to the fields that were
      used only in the equality predicates generated for the natural join.
      1a489190
    • Sergei Golubchik's avatar
      merge · cbd52a42
      Sergei Golubchik authored
      cbd52a42
    • Sergei Golubchik's avatar
      mysql-5.1.62 merge · dea3544b
      Sergei Golubchik authored
      dea3544b
  2. 04 Apr, 2012 8 commits
  3. 03 Apr, 2012 4 commits
  4. 02 Apr, 2012 6 commits
  5. 30 Mar, 2012 8 commits
  6. 29 Mar, 2012 5 commits
  7. 28 Mar, 2012 3 commits
    • Michael Widenius's avatar
      Automatic merge · bb6cc525
      Michael Widenius authored
      bb6cc525
    • Michael Widenius's avatar
      Merge with 5.1 · 3bc932ec
      Michael Widenius authored
      3bc932ec
    • Michael Widenius's avatar
      Fixed lp:944422 "mysql_upgrade destroys Maria tables?" · 74b06493
      Michael Widenius authored
      The issue was that check/optimize/anaylze did not zerofill the table before they started to work on it.
      Added one more element to not often used function handler::auto_repair() to allow handler to decide when to auto repair.
      
      
      mysql-test/suite/maria/r/maria-autozerofill.result:
        Test case for lp:944422
      mysql-test/suite/maria/t/maria-autozerofill.test:
        Test case for lp:944422
      sql/ha_partition.cc:
        Added argument to auto_repair()
      sql/ha_partition.h:
        Added argument to auto_repair()
      sql/handler.h:
        Added argument to auto_repair()
      sql/table.cc:
        Let auto_repair() decide which errors to trigger auto-repair
      storage/archive/ha_archive.h:
        Added argument to auto_repair()
      storage/csv/ha_tina.h:
        Added argument to auto_repair()
      storage/maria/ha_maria.cc:
        Give better error & warning messages for auto-repaired tables.
      storage/maria/ha_maria.h:
        Added argument to auto_repair()
        Always auto-repair in case of moved table.
      storage/maria/ma_open.c:
        Remove special handling of HA_ERR_OLD_FILE (this is now handled in auto_repair())
      storage/myisam/ha_myisam.h:
        Added argument to auto_repair()
      74b06493
  8. 27 Mar, 2012 2 commits