1. 12 Sep, 2013 3 commits
    • Sergey Petrunya's avatar
      Merge 5.3 -> 5.5 · 33f807fd
      Sergey Petrunya authored
      33f807fd
    • Sergey Petrunya's avatar
      MDEV-5011: ERROR Plugin 'MEMORY' has ref_count=1 after shutdown for SJM queries · 7e4845be
      Sergey Petrunya authored
      - Provide a special execution path for cleanup of degenerate 
        non-merged semi-join children of degenerate selects.
      7e4845be
    • Sergei Golubchik's avatar
      tokudb buildbot fixes · adf637df
      Sergei Golubchik authored
      BUILD/compile-solaris-amd64:
        * call cmake directly, don't go through three layers of wrappers
          (but preserve the compile-solaris-amd64 file - buildbot uses it for 5.1 and 5.5)
        * disable jemalloc, it doesn't compile on our sol10-64 box
      storage/federated/ha_federated.cc:
        clang warning
      storage/tokudb/CMakeLists.txt:
        * require cmake-2.8.9, because 2.8.8 doesn't add -fPIC for POSITION_INDEPENDENT_CODE
          property that ft-index CMakeLists.txt files are using
      adf637df
  2. 11 Sep, 2013 1 commit
  3. 10 Sep, 2013 6 commits
    • Sergei Golubchik's avatar
      merge with 5.5-tokudb tree. In particular: · 62643f81
      Sergei Golubchik authored
      * add TokuDB, together with the ft-index library
      * cmake support, auto-detecting whether tokudb can be built
      * fix packaging - tokudb-engine.rpm, deb
      * remove PBXT
      * add jemalloc
      * the server is built with jemalloc by default even if TokuDB is not built
      * documentation files in RPM are installed in the correct location
      * support for optional deb packages (tokudb has specific build requirements)
      * move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient)
      * correct mariadb-test.deb to be not architecture-independent
      * fix out-of-tree builds to never modify in-tree files
      * new handler::prepare_index_scan() method
      62643f81
    • Sergei Golubchik's avatar
    • Sergei Golubchik's avatar
      INSTALL_DOCUMENTATION function for CMakeLists.txt · 3de56134
      Sergei Golubchik authored
      It puts files in the correct location for rpm/deb packages.
      3de56134
    • Sergei Golubchik's avatar
      fix insert.test in --ps-protocol. · 0e107012
      Sergei Golubchik authored
      After MDEV-4817, WHERE clause may be evaluated early, in fix_fields.
      In ps-protocol fix_fields happens both for prepare and execute phase,
      generating double the number of warnings from the early WHERE clause
      executions.
      0e107012
    • Sergei Golubchik's avatar
      * mariadb-tokudb-engine-5.5.deb · 588a1d65
      Sergei Golubchik authored
      * now only production-use server plugins are in mariadb-server.
        client plugins are now in libmariadbclient18,
        testing-only server plugins are now in mariadb-test
        (set Coflicts: field properly)
      * fix Architecture: of mariadb-test
      * terrible hack to support optional deb packages for optional plugins
      588a1d65
    • Alexander Barkov's avatar
      Merge from 5.3 · 8b5da9f7
      Alexander Barkov authored
      pending merges:
        Alexander Barkov 2013-09-09 MDEV-4863 COALESCE(time_or_datetime) returns...
      8b5da9f7
  4. 09 Sep, 2013 23 commits
  5. 08 Sep, 2013 1 commit
  6. 07 Sep, 2013 3 commits
  7. 06 Sep, 2013 3 commits