1. 11 Oct, 2011 4 commits
    • Sergey Petrunya's avatar
      Merge fix for BUG#869012 · 8392fa83
      Sergey Petrunya authored
      8392fa83
    • Sergey Petrunya's avatar
      BUG#869012: Wrong result with semijoin + materialization + AND in WHERE · 039da95e
      Sergey Petrunya authored
      - in make_join_select(), use the correct condition to check whether the current table is a SJM nest (the previous 
        condition used to be correct before, but then sj-materialization temp table creation was moved to happen before
        make_join_select was called)
      039da95e
    • Sergei Golubchik's avatar
      merge · ae633008
      Sergei Golubchik authored
      ae633008
    • Igor Babaev's avatar
      Fixed LP bug #870046. · 8feff690
      Igor Babaev authored
      This bug is a consequence of the fix in the function add_ref_to_table_cond
      for LP bug 826935 that turned out to be not quite correct: it tried to AND
      the same generated condition with two different other conditions.
      This patch creates a copy of the generated condition if the condition needs
      to be ANDed with two different items.
      8feff690
  2. 10 Oct, 2011 4 commits
  3. 08 Oct, 2011 1 commit
  4. 06 Oct, 2011 8 commits
  5. 05 Oct, 2011 5 commits
  6. 04 Oct, 2011 10 commits
    • unknown's avatar
      Fix bug lp:856152 · f40f0ff6
      unknown authored
      Analysis:
      The cause of the bug was that the method
      subselect_rowid_merge_engine::partial_match()
      was not designed for re-execution within the
      same query. Specifically, it didn't cleanup
      the bitmap of matching keys after completion.
      
      The test query requires double execution of
      the IN predicate because it first checks the
      predicate as a constant condition. The second
      execution during regular execution used the bitmap
      of matching keys produced by the first execution
      instead of starting with a clean one.
      
      Solution:
      Cleanup the bitmap of matching keys at the end of
      the partial matching procedure.
      
      f40f0ff6
    • Igor Babaev's avatar
      Made the result test of a test case platform independent · 1c47e1ca
      Igor Babaev authored
      (correction for the previous patch).
      1c47e1ca
    • Igor Babaev's avatar
      3c3a1fbd
    • Sergei Golubchik's avatar
      tests for feedback plugin, · 1b7e5666
      Sergei Golubchik authored
      bugfix: garbage in PLUGIN_VAR_STR variables when INSTALL'ing a plugin
      
      mysql-test/include/default_mysqld.cnf:
        disable feedback plugin by default.
        when enabled - tag is as a test run
      1b7e5666
    • Sergei Golubchik's avatar
      merge feedback plugin · 031e78dd
      Sergei Golubchik authored
      031e78dd
    • Sergei Golubchik's avatar
      fix for static plugins in mariadb. · c0e11db7
      Sergei Golubchik authored
      send "startup" message 5 minutes after startup, not immediately
      
      Makefile.am:
        mariadb uses .la libraries for static plugins.
        mysql - .a libraries
      plug.in:
        mariadb uses .la libraries for static plugins.
        mysql - .a libraries
      sender_thread.cc:
        send "startup" message 5 minutes after startup, not immediately
      url_http.cc:
        avoid "unused variable https" warning
      c0e11db7
    • Sergei Golubchik's avatar
      support for plugins on windows · 630b0b87
      Sergei Golubchik authored
      CMakeLists.txt:
        1. add -DSAFEMALLOC -DSAFE_MUTEX in the top-level CMakeLists.txt
           don't force plugins to copy-paste these lines in their CMakeLists.txt
        2.1 search plugin/* for plugins (not only storage/*),
        2.2 recognize MYSQL_PLUGIN (not only MYSQL_STORAGE_ENGINE),
        2.3 extract library names from the plug.in (don't force library names to
            be ha_<engine>.dll and <engine>.lib)
      include/mysql/plugin.h:
        define MYSQL_PLUGIN_EXPORT appropriately
        (backport from 5.5)
      libmysqld/CMakeLists.txt:
        remove unnecessary workaround
      plugin/fulltext/CMakeLists.txt:
        build fulltext example plugin on windows
      storage/maria/CMakeLists.txt:
        The library is called libmaria_s.lib, not maria.lib
      storage/maria/unittest/CMakeLists.txt:
        The library is called libmaria_s.lib, not maria.lib
      storage/myisam/CMakeLists.txt:
        The library is called libmyisam_s.lib, not myisam.lib
      storage/mysql_storage_engine.cmake:
        introduce MYSQL_PLUGIN macro.
        don't force library names to be ha_<engine>.dll and <engine>.lib
      storage/xtradb/CMakeLists.txt:
        remove a condition from include
      win/README:
        don't use deprecated syntax
      win/configure-mariadb.sh:
        don't use deprecated syntax
      win/configure.js:
        1. support MYSQL_PLUGIN in addition to MYSQL_STORAGE_ENGINE.
        2. support plugin/* in addition to storage/*
      630b0b87
    • Sergei Golubchik's avatar
      my_gethwaddr() on Solaris and Windows · f3523559
      Sergei Golubchik authored
      f3523559
    • Sergei Golubchik's avatar
      remove redundant declarations · 45ee2669
      Sergei Golubchik authored
      45ee2669
    • Igor Babaev's avatar
      Fixed a bad merge. · a55f0cab
      Igor Babaev authored
      Changed a test case to make its result set platform independent.
      a55f0cab
  7. 03 Oct, 2011 5 commits
    • Igor Babaev's avatar
      Merge. · e1194ad6
      Igor Babaev authored
      e1194ad6
    • Sergey Petrunya's avatar
      Merge · cc3680cb
      Sergey Petrunya authored
      cc3680cb
    • Sergey Petrunya's avatar
      Fix buildbot failure in previous fix (BUG#861147): · 1bb7a314
      Sergey Petrunya authored
      - convert_subq_to_jtbm() should always restore the used arena.
      
      1bb7a314
    • unknown's avatar
      Fix bug lp:858038 · ada0850c
      unknown authored
      Analysis:
      The cause of the bug was the changed meaning of
      subselect_partial_match_engine::has_covering_null_row.
      Previously it meant that there is row with NULLs in
      all nullable fields of the materialized subquery table.
      Later it was changed to mean a row with NULLs in all
      fields of this table.
      
      At the same time there was a shortcut in
      subselect_rowid_merge_engine::partial_match() that
      detected a special case where:
      - there is no match in any of the columns with NULLs, and
      - there is no NULL-only row that covers all columns with
        NULLs.
      With the change in the meaning of has_covering_null_row,
      the condition that detected this special case was incomplete.
      This resulted in an incorrect FALSE, when the result was a
      partial match.
      
      Solution:
      Expand the condition that detected the special case with the
      correct test for the existence of a row with NULL values in
      all columns that contain NULLs (a kind of parially covering
      NULL-row).
      ada0850c
    • Sergei Golubchik's avatar
  8. 01 Oct, 2011 3 commits