1. 03 Dec, 2011 1 commit
  2. 02 Dec, 2011 2 commits
  3. 03 Dec, 2011 4 commits
    • Sergei Golubchik's avatar
      update tests · 791286ee
      Sergei Golubchik authored
      791286ee
    • Michael Widenius's avatar
      Merge with 5.1 · 701c0f82
      Michael Widenius authored
      701c0f82
    • Michael Widenius's avatar
      Fixed buildbot warnings · ef841d4c
      Michael Widenius authored
      mysql-test/suite/maria/t/compat_aliases-master.opt:
        Fixed wrong limit
      storage/example/ha_example.cc:
        Fixed compiler warning
      ef841d4c
    • Michael Widenius's avatar
      Added suppressions · 2e34f182
      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
      2e34f182
  4. 02 Dec, 2011 3 commits
  5. 01 Dec, 2011 7 commits
  6. 30 Nov, 2011 5 commits
    • Michael Widenius's avatar
      Merge with 5.1 · efcfb195
      Michael Widenius authored
      efcfb195
    • Michael Widenius's avatar
      Fixed compiler warning and errors · 6378bdbf
      Michael Widenius authored
      mysql-test/suite/funcs_1/t/is_engines_federated.test:
        Corrected path
      storage/xtradb/fil/fil0fil.c:
        Fixed compiler warning
      6378bdbf
    • Michael Widenius's avatar
      Fixed compiler warnings and other bugs found by buildbot. · 692fcba4
      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
      692fcba4
    • Sergei Golubchik's avatar
      test both federated and federatedX in the federated suite. · ca5b1b54
      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
      ca5b1b54
    • unknown's avatar
      Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTOR · be505e3e
      unknown authored
      We merged the test case for this into MariaDB 5.1, but the fix
      was not yet part of XtraDB.
      be505e3e
  7. 29 Nov, 2011 6 commits
    • Michael Widenius's avatar
      Fixed compiler warnings · 47575bd0
      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
      47575bd0
    • Michael Widenius's avatar
      Merge with 5.1 + fixes for build failures in 5.2 · a7f87eff
      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
      a7f87eff
    • Michael Widenius's avatar
      Fixed that maria-recover works as expected. · a19f4e3a
      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
      a19f4e3a
    • Vladislav Vaintroub's avatar
      Fix testcases: · 389acf0a
      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.
      389acf0a
    • Vladislav Vaintroub's avatar
      merge, fix Windows warnings · 82adfe7b
      Vladislav Vaintroub authored
      82adfe7b
    • Vladislav Vaintroub's avatar
  8. 28 Nov, 2011 1 commit
    • Sergei Golubchik's avatar
      after merge fixes · e79847d1
      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
      e79847d1
  9. 24 Nov, 2011 5 commits
    • Michael Widenius's avatar
      Automatic merge · a293d078
      Michael Widenius authored
      a293d078
    • Michael Widenius's avatar
      Fixed that one can use --maria-recover=backup,force · 1670845c
      Michael Widenius authored
      (Before we only allowed one option)
      1670845c
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Merge with MariaDB 5.1 · 69204571
      Michael Widenius authored
      69204571
    • Michael Widenius's avatar
      Fixes for build failuers found by buildbot · d26aefb0
      Michael Widenius authored
      mysql-test/mysql-test-run.pl:
        Rename MYSQLD -> MYSQLD_SIMPLE_CMD to avoid conflict with new MYSQLD variable from MySQL 5.1
      mysql-test/r/innodb_file_format.result:
        Remove old duplicated test
      mysql-test/suite/pbxt/r/endspace.result:
        Update test to last version
      mysql-test/suite/pbxt/r/heap.result:
        Removed heap test (not part of pbxt)
      mysql-test/suite/pbxt/r/select_safe.result:
        Updated results after error message change
      mysql-test/suite/pbxt/r/view_grant.result:
        Removed view test (not part of pbxt)
      mysql-test/suite/pbxt/t/endspace.test:
        Update test to last version
      mysql-test/suite/pbxt/t/heap.test:
        Removed heap test (not part of pbxt)
      mysql-test/suite/pbxt/t/view_grant.test:
        Removed view test (not part of pbxt)
      mysql-test/t/innodb_file_format.test:
        Remove old duplicated test
      mysql-test/t/mysqld_option_err.test:
        Use renamed variable
      sql/my_decimal.h:
        Fixed wrong define
      storage/maria/ma_loghandler.c:
        Fixed compiler warning
      d26aefb0
  10. 23 Nov, 2011 2 commits
  11. 22 Nov, 2011 1 commit
  12. 21 Nov, 2011 3 commits