1. 14 Feb, 2012 2 commits
    • unknown's avatar
      Merge MySQL 5.5.20 into MariaDB 5.5. · 47a54a2e
      unknown authored
      47a54a2e
    • unknown's avatar
      Fix wrong error code in the test case. · bbd20403
      unknown authored
      The replication slave sets first error 1913 and immediately after error
      1595. Thus it is possible, but unlikely, to get 1913. The original test
      seems to realise this, but uses an invalid error code - my guess is
      that this was a temporary code used in a feature tree, which was then
      forgotten to be fixed when merged to main. The removed "1923" is
      something committed by mistake during tests.
      bbd20403
  2. 11 Feb, 2012 1 commit
  3. 10 Feb, 2012 3 commits
  4. 09 Feb, 2012 1 commit
    • unknown's avatar
      Fix a number of problems in the test suite (no code bugs): · 6e9b06d9
      unknown authored
       - mysql-test-run.pl --valgrind complains when all tests succeed.
      
       - perfschema.all_instances fail on non-linux, where ENABLE_TEMP_POOL
         is not set and therefore BITMAP mutex is not used.
      
       - MDEV-132: main.mysqldump fails because it depends on exact size of stdio
         buffers.
      
       - MDEV-99: rpl.rpl_cant_read_event_incident fails due to a race where the
         slave manages to connect while the test case is in the middle of setting up
         the master, causing the slave to replicate extra/wrong events.
      
       - MDEV-133: rpl.rpl_rotate_purge_deadlock fails because it issues a
         DEBUG_SYNC SIGNAL immediately followed by RESET; this means that sometimes
         the intended receipient has no time to see the signal before it is cleared
         by the RESET, causing wait to timeout.
      6e9b06d9
  5. 08 Feb, 2012 1 commit
  6. 06 Feb, 2012 1 commit
  7. 03 Feb, 2012 4 commits
  8. 02 Feb, 2012 3 commits
  9. 01 Feb, 2012 1 commit
  10. 31 Jan, 2012 2 commits
  11. 30 Jan, 2012 1 commit
  12. 29 Jan, 2012 1 commit
  13. 28 Jan, 2012 5 commits
  14. 27 Jan, 2012 3 commits
    • unknown's avatar
      Fix main.openssl_1 failures for -DWITH_SSL=system build. · 9c922f48
      unknown authored
      In 5.5, ssl_do() no longer calls report_errors() in case of ssl error.
      Since report_errors() iterated over the list of errors, this means that we
      now report the first error in the list, rather than the last. Adjust the
      --replace_regex line for OpenSSL build accordingly in the test case.
      9c922f48
    • unknown's avatar
      Revert some earlier changes to my.cnf and mariadb.cnf. · 595cbf09
      unknown authored
      I want to avoid that upgrades silently change important config parameters
      that users have come to rely on. This could happen if users changed their
      my.cnf themselves, and then an upgrade introduces mariadb.cnf which silently
      overrides the settings in my.cnf. Avoid this by having mariadb.cnf mostly
      empty for now, and in the future we can add just new mariadb-specific
      options there that do not break existing installations.
      595cbf09
    • unknown's avatar
      b0a17a2f
  15. 26 Jan, 2012 8 commits
  16. 25 Jan, 2012 3 commits