1. 13 Dec, 2011 2 commits
    • Michael Widenius's avatar
      Merge with 5.1 · 0bb7d6e8
      Michael Widenius authored
      Updated version number in configure
      0bb7d6e8
    • Michael Widenius's avatar
      Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE · b7de2b31
      Michael Widenius authored
      mysql-test/suite/maria/r/maria-recovery3.result:
        Added test case for recovery bug
      mysql-test/suite/maria/t/maria-recovery3.test:
        Added test case for recovery bug
      storage/maria/ha_maria.cc:
        Don't print query twice to log
      storage/maria/ma_delete.c:
        More DBUG_PRINT
      storage/maria/ma_key_recover.c:
        Added new asserts to detect errors earlier
      storage/maria/ma_recovery.c:
        Update all states when moving a non-transactional file to transactional. This fixes lp:887051
      b7de2b31
  2. 12 Dec, 2011 3 commits
    • Sergei Golubchik's avatar
      0636b67c
    • unknown's avatar
      206a8c32
    • unknown's avatar
      Fixed bug lp:900375 · f50cd8e5
      unknown authored
      The range optimizer incorrectly chose a loose scan for group by
      when there is a correlated WHERE condition. This range access
      method cannot be executed for correlated conditions also with the
      "range checked for each record" because generally the range access
      method can change for each outer record. Loose scan destructively
      changes the query plan and removes the GROUP operation, which will
      result in wrong query plans if another range access is chosen
      dynamically.
      f50cd8e5
  3. 11 Dec, 2011 1 commit
  4. 08 Dec, 2011 1 commit
    • unknown's avatar
      Fixed bug lp:888456 · a1aa89d8
      unknown authored
      Analysis:
      The class member QUICK_GROUP_MIN_MAX_SELECT::seen_first_key
      was not reset between subquery re-executions. Thus each
      subsequent execution continued from the group that was
      reached by the previous subquery execution. As a result
      loose scan reached end of file much earlier, and returned
      empty result where it shouldn't.
      
      Solution:
      Reset seen_first_key before each re-execution of the
      loose scan.
      a1aa89d8
  5. 03 Dec, 2011 2 commits
    • Sergei Golubchik's avatar
      updated the version in configure · 61903612
      Sergei Golubchik authored
      61903612
    • Michael Widenius's avatar
      Added suppressions · 2c2e74e5
      Michael Widenius authored
      Fixed feedback_plugin_send to not generate a random number of lines.
      
      
      mysql-test/t/feedback_plugin_send.test:
        Don't print more than 4 lines (sometimes there are 6 feedback lines in the log...)
      mysql-test/valgrind.supp:
        Added suppression for failure on work
      support-files/compiler_warnings.supp:
        Suppress warning from xtradb
      2c2e74e5
  6. 02 Dec, 2011 2 commits
  7. 03 Dec, 2011 3 commits
  8. 02 Dec, 2011 3 commits
  9. 01 Dec, 2011 7 commits
  10. 30 Nov, 2011 5 commits
    • Michael Widenius's avatar
      Merge with 5.1 · a4754d9d
      Michael Widenius authored
      a4754d9d
    • Michael Widenius's avatar
      Fixed compiler warning and errors · 62e68139
      Michael Widenius authored
      mysql-test/suite/funcs_1/t/is_engines_federated.test:
        Corrected path
      storage/xtradb/fil/fil0fil.c:
        Fixed compiler warning
      62e68139
    • Michael Widenius's avatar
      Fixed compiler warnings and other bugs found by buildbot. · 3a8e7aa8
      Michael Widenius authored
      
      client/mysqltest.cc:
        Free mutex after usage (fixes valgrind warnings in embedded server)
      mysql-test/include/gis_keys.inc:
        Fixed failure in innodb.gis_test
      mysql-test/r/gis.result:
        Updated result
      mysql-test/suite/innodb/r/innodb_gis.result:
        Updated results
      mysql-test/suite/innodb/t/innodb_bug38231.test:
        Added handling of timeouts (happend on some servers in buildbot)
      mysql-test/suite/innodb_plugin/r/innodb_gis.result:
        Updated results
      mysql-test/suite/innodb_plugin/t/innodb.test:
        Use error names instead of numbers
      mysql-test/suite/innodb_plugin/t/innodb_misc1.test:
        This test requires utf8
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test:
        This test requires Xtradb
      sql/sql_base.cc:
        Don't print table names for placeholders.
      sql/sql_show.cc:
        Temporary fix:
        Save and restore db and table_name in mysqld_show_create (to get rid of valgrind warning)
        A better solution that needs to be investgated is to not change these fields in mysql_derived_prepare()
      sql/sql_view.cc:
        Fixed valgrind warning
      storage/xtradb/handler/ha_innodb.cc:
        Don't access THD directly
      3a8e7aa8
    • Sergei Golubchik's avatar
      test both federated and federatedX in the federated suite. · 751c8733
      Sergei Golubchik authored
      mysql-test/lib/My/Options.pm:
        My::Options::is_set() now matches both option names and values!
      mysql-test/lib/mtr_cases.pm:
        1. don't merge --plugin-load here, it's too early
        2. don't skip combinations that set --plugin-load just because the test needs another --plugin-load.
           Skip *only* if test's --plugin-load matches *exactly* --plugin-load of one of the combinations.
        3. if skipping all combinations but one, still assign the test to the combination
      mysql-test/mysql-test-run.pl:
        1. remove dead code - don't set variables that aren't used.
        2. bugfix: allow one-letter combination names
        3. in the command line, merge all --plugin-load options in one
      storage/federated/ha_federated.cc:
        bugfix: garbage character in the generated SELECT query
      751c8733
    • unknown's avatar
      Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTOR · 6d2297e3
      unknown authored
      We merged the test case for this into MariaDB 5.1, but the fix
      was not yet part of XtraDB.
      6d2297e3
  11. 29 Nov, 2011 6 commits
    • Michael Widenius's avatar
      Fixed compiler warnings · 776858b1
      Michael Widenius authored
      dbug/tests.c:
        Added __attribute__((unused)) to get rid of compiler warning
      server-tools/instance-manager/guardian.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/filesort.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/slave.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/sql_load.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/sql_table.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/maria/ma_blockrec.c:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/maria/ma_check.c:
        Added missing cast
      storage/maria/ma_loghandler.c:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/maria/ma_recovery.c:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/pbxt/src/cache_xt.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/xtradb/fil/fil0fil.c:
        Removed not used variable
      storage/xtradb/handler/ha_innodb.cc:
        Use unused variable
      vio/viosocket.c:
        Remove usage of not used variable
      vio/viosslfactories.c:
        Added cast
      776858b1
    • Michael Widenius's avatar
      Merge with 5.1 + fixes for build failures in 5.2 · e71cd205
      Michael Widenius authored
      cmd-line-utils/libedit/map.c:
        Fixed compiler warning
      cmd-line-utils/libedit/terminal.c:
        Fixed compiler warning
      cmd-line-utils/libedit/tty.c:
        Fixed compiler warning
      sql/sql_base.cc:
        Fixed memory leak found by valgrind
      storage/maria/compat_aliases.cc:
        Ensure that recover_alias is also a set
      storage/maria/ma_bitmap.c:
        Proper fix for compiler warning
      support-files/compiler_warnings.supp:
        Fixed compiler warning
      e71cd205
    • Michael Widenius's avatar
      Fixed that maria-recover works as expected. · 6a993f0b
      Michael Widenius authored
      - "" is now used if no option is set
      
      include/maria.h:
        Added HA_RECOVER_ANY
      storage/maria/ha_maria.cc:
        Insert of checking if maria_recover_options == 0, check if any bit is set.
        Fix maria_recover_names to match bitmap. This fixes that recover options works as expected.
      storage/maria/ha_maria.h:
        Insert of checking if maria_recover_options == 0, check if any bit is set.
      storage/maria/ma_check.c:
        Fixed wrong print
      6a993f0b
    • Vladislav Vaintroub's avatar
      Fix testcases: · 09d55451
      Vladislav Vaintroub authored
      1. main.merge fails with errno 13 in copy_file().
      
      The reason for the error is that copy_file tries to create a file with the same name as recently deleted one,
      and there is still an open handle for the deleted file.
      To fix, use my_delete_allow_opened() for MTR's delete_file. On Windows,  this renames file to unique name
      prior to deletion, and prevents EACCES errors for files opened with FILE_SHARE_DELETE.
      
      2. innodb_bug59641 
      generates warnings, after server was killed and restarted in the test case.
      The warnings are about test_suppression table (needs to be repaired, as it that was written just prior to the crash)
      Fixed by using FLUSH TABLES after populating warning suppression table.
      09d55451
    • Vladislav Vaintroub's avatar
      merge, fix Windows warnings · b33883f1
      Vladislav Vaintroub authored
      b33883f1
    • Vladislav Vaintroub's avatar
  12. 28 Nov, 2011 1 commit
    • Sergei Golubchik's avatar
      after merge fixes · f6db6c83
      Sergei Golubchik authored
      sql/sql_base.cc:
        fix a memory leak
      storage/xtradb/handler/ha_innodb.cc:
        fix for a visual studio
      storage/xtradb/row/row0ins.c:
        valgrind complains about uninitialized variable.
        incorrect errors in the innodb.test too
      f6db6c83
  13. 24 Nov, 2011 4 commits