1. 18 Feb, 2015 2 commits
  2. 17 Feb, 2015 1 commit
  3. 18 Feb, 2015 4 commits
  4. 13 Feb, 2015 1 commit
  5. 12 Feb, 2015 1 commit
  6. 10 Feb, 2015 3 commits
  7. 06 Feb, 2015 2 commits
    • Igor Babaev's avatar
      Merge · ffd2996e
      Igor Babaev authored
      ffd2996e
    • Igor Babaev's avatar
      Fixed bug mdev-7316. · 587c7208
      Igor Babaev authored
      The function table_cond_selectivity() should take into account that condition selectivity
      for some fields can be set to 0.
      587c7208
  8. 30 Jan, 2015 2 commits
  9. 29 Jan, 2015 4 commits
  10. 28 Jan, 2015 1 commit
  11. 25 Jan, 2015 1 commit
    • Sergey Petrunya's avatar
      MDEV-5719: Wrong result with GROUP BY and LEFT OUTER JOIN · fb71449b
      Sergey Petrunya authored
      Merged revision 5224 from mysql-5.6 and added a test case.
      ..
      revno: 5224
      committer: Sergey Glukhov <sergey.glukhov@oracle.com>
      branch nick: mysql-5.6
      timestamp: Wed 2013-06-19 14:24:08 +0400
      message:
          Bug#16620047 INCORRECT QUERY RESULT (AFTER SERVER UPGRADE)
      fb71449b
  12. 24 Jan, 2015 1 commit
  13. 29 Jan, 2015 2 commits
    • Michael Widenius's avatar
      Ignore some tokudb executables · 45ff0d62
      Michael Widenius authored
      45ff0d62
    • Michael Widenius's avatar
      MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML... · b83f6925
      Michael Widenius authored
      MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML flow with views and triggers
      
      Call mysql_derived_reinit() if we are reusing view.
      This is needed as during a previous error condition the view may not have been reset
      
      sql/sql_derived.cc:
        More DBUG_PRINT
        Always reset merged_for_insert (no reason to not do that)
      sql/sql_derived.h:
        Added prototype
      sql/sql_insert.cc:
        More DBUG_PRINT
        Added DBUG_ASSERT
      sql/sql_view.cc:
        Call mysql_derived_reinit() if we are reusing view.
        This is needed as during a previous error condition the view may not have been reset
      sql/table.cc:
        More DBUG_PRINT
      b83f6925
  14. 23 Jan, 2015 4 commits
  15. 22 Jan, 2015 2 commits
  16. 21 Jan, 2015 6 commits
  17. 20 Jan, 2015 2 commits
    • Olivier Bertrand's avatar
      - Last revision was to add the JSON table type. This one adds a sort · e5767723
      Olivier Bertrand authored
        on the multiple table result to obtain the same result on Windows
        and Linux (because files can be retrieved in a different order)
      modified:
        storage/connect/mysql-test/connect/r/json.result
        storage/connect/mysql-test/connect/t/json.test
      e5767723
    • Olivier Bertrand's avatar
      - Fix compile errors and warnings of LINUX G++ · 8fc69564
      Olivier Bertrand authored
      added:
        storage/connect/json.cpp
        storage/connect/json.h
        storage/connect/mysql-test/connect/r/json.result
        storage/connect/mysql-test/connect/std_data/biblio.jsn
        storage/connect/mysql-test/connect/std_data/expense.jsn
        storage/connect/mysql-test/connect/std_data/mulexp3.jsn
        storage/connect/mysql-test/connect/std_data/mulexp4.jsn
        storage/connect/mysql-test/connect/std_data/mulexp5.jsn
        storage/connect/mysql-test/connect/t/json.test
        storage/connect/tabjson.cpp
        storage/connect/tabjson.h
      modified:
        storage/connect/CMakeLists.txt
        storage/connect/engmsg.h
        storage/connect/filamtxt.h
        storage/connect/ha_connect.cc
        storage/connect/msgid.h
        storage/connect/mycat.cc
        storage/connect/plgdbsem.h
        storage/connect/tabdos.cpp
        storage/connect/value.cpp
        storage/connect/value.h
      8fc69564
  18. 19 Jan, 2015 1 commit
    • Olivier Bertrand's avatar
      - Adding the JSON table type · 2d2e110b
      Olivier Bertrand authored
      added:
        storage/connect/json.cpp
        storage/connect/json.h
        storage/connect/mysql-test/connect/r/json.result
        storage/connect/mysql-test/connect/std_data/biblio.jsn
        storage/connect/mysql-test/connect/std_data/expense.jsn
        storage/connect/mysql-test/connect/std_data/mulexp3.jsn
        storage/connect/mysql-test/connect/std_data/mulexp4.jsn
        storage/connect/mysql-test/connect/std_data/mulexp5.jsn
        storage/connect/mysql-test/connect/t/json.test
        storage/connect/tabjson.cpp
        storage/connect/tabjson.h
      modified:
        storage/connect/CMakeLists.txt
        storage/connect/engmsg.h
        storage/connect/filamtxt.h
        storage/connect/ha_connect.cc
        storage/connect/msgid.h
        storage/connect/mycat.cc
        storage/connect/plgdbsem.h
        storage/connect/tabdos.cpp
        storage/connect/value.cpp
        storage/connect/value.h
      2d2e110b