1. 28 Jan, 2012 1 commit
  2. 27 Jan, 2012 3 commits
    • unknown's avatar
      Fix main.openssl_1 failures for -DWITH_SSL=system build. · 93e4f648
      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.
      93e4f648
    • unknown's avatar
      Revert some earlier changes to my.cnf and mariadb.cnf. · 4539ec02
      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.
      4539ec02
    • unknown's avatar
      f8d36040
  3. 26 Jan, 2012 8 commits
  4. 25 Jan, 2012 3 commits
  5. 24 Jan, 2012 4 commits
    • Michael Widenius's avatar
      Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO"; · adf9dadf
      Michael Widenius authored
      Don't log updates to performance schema in replication log.
      Ensure that we don't call ha_update after ha_index_or_rnd_end() is called on slave.
      
      
      .bzrignore:
        Ignore some generated files
      mysql-test/include/show_slave_status.inc:
        Ensure that ./ is removed from file names
      mysql-test/suite/perfschema/r/binlog_mix.result:
        Updated results
      mysql-test/suite/perfschema/r/binlog_row.result:
        Updated results
      mysql-test/suite/perfschema/r/binlog_stmt.result:
        Updated results
      mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result:
        Updated results
      mysql-test/suite/rpl/r/rpl_performance_schema.result:
        Ensure that we don't crash slave when we update performance schema
      mysql-test/suite/rpl/t/rpl_performance_schema.test:
        Ensure that we don't crash slave when we update performance schema
      sql/log_event.cc:
        Ensure that we don't call ha_update after ha_index_or_rnd_end() is called.
        Remove old code that is not needed anymore (like restarting read loop over all rows if no matcing row is found)
        Simplify code
      sql/log_event_old.cc:
        Ensure that we don't call ha_update after ha_index_or_rnd_end() is called.
      storage/myisam/ha_myisam.cc:
        More DBUG_PRINT
      storage/perfschema/ha_perfschema.h:
        Don't log updates to performance schema in replication log.
      adf9dadf
    • unknown's avatar
      More 5.5 .deb packaging fixes · 34655221
      unknown authored
      34655221
    • unknown's avatar
      a2a6880c
    • unknown's avatar
  6. 23 Jan, 2012 4 commits
  7. 20 Jan, 2012 5 commits
  8. 19 Jan, 2012 4 commits
  9. 18 Jan, 2012 3 commits
  10. 17 Jan, 2012 2 commits
  11. 16 Jan, 2012 3 commits
    • Sergei Golubchik's avatar
      merge · 91303ace
      Sergei Golubchik authored
      91303ace
    • Sergei Golubchik's avatar
      remove unused flag · c218b0b9
      Sergei Golubchik authored
      c218b0b9
    • Sergei Golubchik's avatar
      query cache sysvar fixes · d95b83b0
      Sergei Golubchik authored
      sql/share/errmsg-utf8.txt:
        correct the error message, as query_cache_type variable is not read-ony anymore
      sql/sql_cache.cc:
        the caller should verify that query cache resize
        is possible, before trying it
      sql/sys_vars.cc:
        * test if qc resize is possible in the sysvar on_check() funntion,
          not in the on_update() function.
        * use the error message that better describes the problem
      d95b83b0