1. 28 Jan, 2010 2 commits
    • Michael Widenius's avatar
      Merge with fixes for compiler warnings and 2 fixed test cases · e926af9b
      Michael Widenius authored
      Fixed some additional compiler warnings from OpenSolaris build.
      
      
      extra/libevent/devpoll.c:
        Fixed compiler warning
      mysys/my_file.c:
        Fixed compiler warning
      sql/mysqld.cc:
        Fixed compiler warning
      sql/rpl_record.cc:
        Removed not used variable
      storage/maria/ma_blockrec.c:
        Fixed compiler warning
      storage/xtradb/buf/buf0buf.c:
        Fixed compiler warning
      storage/xtradb/handler/i_s.cc:
        Fixed compiler warning
      support-files/compiler_warnings.supp:
        Added suppression of compiler warnings in InnoDB/XtraDB
        Added suppression of compiler warnings that can safely be ignored.
      e926af9b
    • unknown's avatar
      automerge windows fixes. · ef0416c1
      unknown authored
      ef0416c1
  2. 27 Jan, 2010 3 commits
    • Michael Widenius's avatar
      Fixed some compiler warnings and errors in test suite found by buildbot · e2efd933
      Michael Widenius authored
      include/ft_global.h:
        Changed string size to 'size_t' (to avoid compiler warnings later)
      include/maria.h:
        Changed string size to 'size_t' (to avoid compiler warnings later)
      mysql-test/r/show_check.result:
        Don't use logging to tables, as there is no guarantee in which order tables are showed in 'show open tables'
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        Use HIGH_PRIORITY inserts to avoid problem with concurrent inserts on the slave.
      mysql-test/t/show_check-master.opt:
        Don't use logging to tables, as there is no guarantee in which order tables are showed in 'show open tables'
      sql/item.cc:
        Fixed compiler warning
      storage/maria/ft_maria.c:
        Changed string size to 'size_t' (to avoid compiler warnings later)
      storage/myisam/ft_boolean_search.c:
        Fixed compiler warnings
      storage/myisam/ft_myisam.c:
        Changed string size to 'size_t' (to avoid compiler warnings later)
      storage/myisam/ft_nlq_search.c:
        Changed string size to 'size_t' (to avoid compiler warnings later)
      storage/myisam/ft_parser.c:
        Changed string size to 'size_t' (to avoid compiler warnings)
      storage/myisam/ft_stopwords.c:
        Changed string size to 'size_t' (to avoid compiler warnings)
      storage/myisam/ftdefs.h:
        Changed string size to 'size_t' (to avoid compiler warnings)
      e2efd933
    • unknown's avatar
      Fix test failures due to previous change of not setting TZ by default. · 7c8983e9
      unknown authored
      Fix by explicitly setting timezone for a few more tests that need it.
      (We avoid setting TZ everywhere by default as this breaks some tests
      on windows).
      
      Also add fix of two other windows failures due to non-portable
      suppressions, thanks to Alex Budovski.
      
      mysql-test/mysql-test-run.pl:
        Don't let --timezone option from one test stray into the next test
        (mostly to make results more deterministic rather than depend on
        whatever test happens to run just before).
      mysql-test/suite/maria/r/maria-recover.result:
        Fix suppression pattern to also work with Windows \ path separator.
      mysql-test/suite/maria/t/maria-recover.test:
        Fix suppression pattern to also work with Windows \ path separator.
      mysql-test/suite/parts/inc/partition_timestamp.inc:
        Set timezone explicitly for test that needs it.
      mysql-test/suite/parts/r/partition_recover_myisam.result:
        Fix suppression pattern to also work with Windows \ path separator.
      mysql-test/suite/parts/t/partition_recover_myisam.test:
        Fix suppression pattern to also work with Windows \ path separator.
      mysql-test/t/mysqlbinlog_row-master.opt:
        Set timezone explicitly for test that needs it.
      mysql-test/t/mysqlbinlog_row_innodb-master.opt:
        Set timezone explicitly for test that needs it.
      mysql-test/t/mysqlbinlog_row_myisam-master.opt:
        Set timezone explicitly for test that needs it.
      mysql-test/t/mysqlbinlog_row_trans-master.opt:
        Set timezone explicitly for test that needs it.
      7c8983e9
    • Sergei Golubchik's avatar
      YaSSL cert info buffer overflow fix · 0d09e3a5
      Sergei Golubchik authored
      Apply a diff from
        [Yassl-commit] yassl/taocrypt/src asn.cpp,1.13,1.14
        [Yassl-commit] yassl/taocrypt/include asn.hpp,1.9,1.10
      Original patch
        http://lists.mysql.com/commits/96697
      
      extra/yassl/taocrypt/include/asn.hpp:
        [Yassl-commit] yassl/taocrypt/include asn.hpp,1.9,1.10
      extra/yassl/taocrypt/src/asn.cpp:
        [Yassl-commit] yassl/taocrypt/src asn.cpp,1.13,1.14
      0d09e3a5
  3. 22 Jan, 2010 1 commit
  4. 19 Jan, 2010 1 commit
    • unknown's avatar
      Fix Windows test failures in binlog tests in certain time zones. · 80ac8858
      unknown authored
      On Unix systems TZ can be set to change the time zone for specific processes only.
      But on Windows this does not fully work. It changes some aspects of time zones
      in the system but not others (notably localtime() vs. file system time stamps).
      
      This causes test failures in Windows in certain time zones (but not all),
      where PURGE BEFORE DATE statements get the wrong files when TZ is set to
      +03:00 by default.
      
      Fix by only setting TZ in the small number of tests that really need it, and leave
      it untouched in the rest.
      
      Thanks to Alex Budovski for helping with this.
      
      mysql-test/include/ps_conv.inc:
        Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it.
      mysql-test/mysql-test-run.pl:
        Do not set TZ by default, as it causes problems on Windows.
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it.
      mysql-test/suite/binlog/t/binlog_unsafe.test:
        Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it.
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result:
        Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it.
      mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test:
        Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it.
      mysql-test/t/mysqlbinlog2-master.opt:
        mysql-test-run.pl no longer sets TZ by default, so set it explicitly for this particular test.
      80ac8858
  5. 18 Jan, 2010 1 commit
    • unknown's avatar
      Fixes for some randomly occuring test failures in Buildbot. · 159ff4c1
      unknown authored
      mysql-test/r/innodb-timeout.result:
        Make test more robust to scheduling delays on the host running the test suite.
      mysql-test/suite/rpl/r/rpl_relayspace.result:
        Apply patch from BUG#25228 and tweak timeout value in an attempt to fix random
        failure of this test in Buildbot (could not repeat locally).
      mysql-test/suite/rpl/t/rpl_relayspace.test:
        Apply patch from BUG#25228 and tweak timeout value in an attempt to fix random
        failure of this test in Buildbot (could not repeat locally).
      mysql-test/t/innodb-timeout.test:
        Make test more robust to scheduling delays on the host running the test suite.
      mysql-test/valgrind.supp:
        Add suppression for Glibc bug.
      159ff4c1
  6. 17 Jan, 2010 3 commits
  7. 16 Jan, 2010 1 commit
    • unknown's avatar
      Result file updates following merge of MySQL 5.1.42 and XtraDB 9. · ccdd2c23
      unknown authored
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        XTRADB_ADMIN_COMMAND table added.
        Column name change: "accessed" -> "access" (XtraDB 9 change).
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        XTRADB_ADMIN_COMMAND table added.
      mysql-test/suite/pbxt/r/func_group.result:
        Update results to be correct following fix of Bug#43668.
      mysql-test/suite/pbxt/r/mysqlshow.result:
        XTRADB_ADMIN_COMMAND table added.
      ccdd2c23
  8. 15 Jan, 2010 10 commits
  9. 14 Jan, 2010 2 commits
    • Michael Widenius's avatar
      Fix for compiler warnings on windows · d121e663
      Michael Widenius authored
      Fix wrong cast of time()
      
      include/my_pthread.h:
        Safety fix that also removes compiler warnings
      sql/handler.h:
        Changed timestamp columns to be of type time_t
      storage/maria/ma_check.c:
        Removed wrong cast
      storage/maria/ma_create.c:
        Removed wrong cast
      storage/myisam/mi_check.c:
        Removed wrong cast
      storage/myisam/mi_create.c:
        Removed wrong cast
      storage/xtradb/handler/ha_innodb.cc:
        Removed compiler warning on windows
      d121e663
    • Michael Widenius's avatar
      Fixed compile error on windows. · e4535de1
      Michael Widenius authored
      e4535de1
  10. 12 Jan, 2010 3 commits
  11. 11 Jan, 2010 2 commits
    • unknown's avatar
    • unknown's avatar
      Fix multiple test suite failures in Buildbot due to races in the test cases or... · 0855019e
      unknown authored
      Fix multiple test suite failures in Buildbot due to races in the test cases or missing server features not properly checked
      
      mysql-test/r/func_misc.result:
        Move test that requires query cache from main.func_misc to main.query_cache.
      mysql-test/r/mysqltest.result:
        Fix test failure due to race.
        This test case creates > 300 connections in a tight loop, and depending on thread
        scheduling and load, even though each connection is immediately disconnected
        before connecting the next one, the server max connections may still be exceeded
        due to server not being able to free old connections as fast as new ones are made.
      mysql-test/r/query_cache.result:
        Move test that requires query cache from main.func_misc to main.query_cache.
        Move test that requires query cache from main.variables to main.query_cache.
      mysql-test/r/query_cache_notembedded.result:
        Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
      mysql-test/r/sp_notembedded.result:
        Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
      mysql-test/r/udf.result:
        Move test in main.udf that requires query cache to separate file.
      mysql-test/r/udf_query_cache.result:
        Move test in main.udf that requires query cache to separate file.
      mysql-test/r/variables.result:
        Move test that requires query cache from main.variables to main.query_cache.
      mysql-test/suite/funcs_1/datadict/processlist_val.inc:
        Fix race where result file may show state "cleaning up" in the small window
        between setting COMMAND to 'Sleep' and clearing STATE.
      mysql-test/suite/rpl/r/rpl_temporary.result:
        Fix race with suppression of warning message by fixing the test to not generate the
        warning message in the first place.
        
        Problem was a race between creating an anonymous account and resetting the slave.
        If the slave reset happens before replicating the account, the subsequest deletion
        of the account will fail to replicate correctly due to missing row.
      mysql-test/suite/rpl/t/rpl_temporary.test:
        Fix race with suppression of warning message by fixing the test to not generate the
        warning message in the first place.
        
        Problem was a race between creating an anonymous account and resetting the slave.
        If the slave reset happens before replicating the account, the subsequest deletion
        of the account will fail to replicate correctly due to missing row.
      mysql-test/t/func_misc.test:
        Move test that requires query cache from main.func_misc to main.query_cache.
        Move test that requires query cache from main.variables to main.query_cache.
      mysql-test/t/mysqltest.test:
        Fix test failure due to race.
        This test case creates > 300 connections in a tight loop, and depending on thread
        scheduling and load, even though each connection is immediately disconnected
        before connecting the next one, the server max connections may still be exceeded
        due to server not being able to free old connections as fast as new ones are made.
      mysql-test/t/query_cache.test:
        Move test that requires query cache to main.query_cache.
      mysql-test/t/query_cache_notembedded.test:
        Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
      mysql-test/t/sp_notembedded.test:
        Move test that requires query cache from main.sp_notembedded to main.query_cache_notembedded.
      mysql-test/t/udf.test:
        Move test in main.udf that requires query cache to separate file.
      mysql-test/t/udf_query_cache-master.opt:
        Move test in main.udf that requires query cache to separate file.
      mysql-test/t/udf_query_cache.test:
        Move test in main.udf that requires query cache to separate file.
      mysql-test/t/variables.test:
        Move test that requires query cache from main.variables to main.query_cache.
      tests/mysql_client_test.c:
        In tests that require query cache, skip the test if query cache not available.
        Do this dynamically rather than using HAVE_QUERY_CACHE, as there is no guarantee
        that the server we run against was compiled with same preprocessor #define as
        the mysql_client_test program (and since it is trivial to check dynamically).
      0855019e
  12. 09 Jan, 2010 4 commits
  13. 07 Jan, 2010 3 commits
  14. 06 Jan, 2010 3 commits
    • Michael Widenius's avatar
      Removed compiler warnings · b96f268a
      Michael Widenius authored
      Fixed sporadic test failure for suit/pbxt/t/lock_multi.test
      Fixed sporadic test faulure for suit/rpl/t/do_grant.test
      OpenSolaris 5.11-x86 now compiles (tested with 32 bit)
      
      BUILD/compile-solaris-amd64-debug-forte:
        Added execute bit
      BUILD/compile-solaris-x86-32:
        Added execute bit
      BUILD/compile-solaris-x86-32-debug:
        Added execute bit
      BUILD/compile-solaris-x86-32-debug-forte:
        Added execute bit
      BUILD/compile-solaris-x86-forte-32:
        Added execute bit
      extra/libevent/devpoll.c:
        Removed compiler warning
      extra/libevent/evbuffer.c:
        Removed compiler warning
      extra/libevent/select.c:
        Removed compiler warning
      mysql-test/mysql-test-run.pl:
        Fixed sporadic test faulure for suit/rpl/t/do_grant.test (Seen on OpenSolaris)
      mysql-test/suite/pbxt/r/lock_multi.result:
        Fixed sporadic test failure for suit/pbxt/t/lock_multi.test (seen in buildbot)
        This was done by merging the test with main/lock_multi.test
      mysql-test/suite/pbxt/t/lock_multi.test:
        Fixed sporadic test failure for suit/pbxt/t/lock_multi.test (seen in buildbot)
        This was done by merging the test with main/lock_multi.test
      mysys/my_sync.c:
        Removed compiler warnings
      sql/ha_ndbcluster.cc:
        Fixed linking error on OpenSolaris when compiling without ndb
        Bug #34866 Can't compile on Solaris 9/Sparc with gcc
      storage/archive/azlib.h:
        Removed compiler warning about redefined symbols
      storage/maria/ma_blockrec.c:
        Removed compiler warning
      storage/maria/ma_loghandler.c:
        Removed compiler warning
      storage/maria/ma_test3.c:
        Removed compiler warning
      storage/myisam/mi_test3.c:
        Removed compiler warning
      storage/pbxt/src/ha_pbxt.cc:
        Removed compiler warning
        thr_main -> thr_main_pbxt
      storage/pbxt/src/restart_xt.cc:
        thr_main -> thr_main_pbxt
      storage/pbxt/src/thread_xt.cc:
        thr_main -> thr_main_pbxt
        This was needed as thr_main() is an internal thread function on OpenSolaris()
      storage/pbxt/src/thread_xt.h:
        thr_main -> thr_main_pbxt
      storage/xtradb/srv/srv0srv.c:
        Use compatiblity macro to get code to work on OpenSolaris
      support-files/compiler_warnings.supp:
        Ignore compiler warning from yassl
      b96f268a
    • Aleksandr Kuzminsky's avatar
      5b0ab60a
    • unknown's avatar
      Automatic merge. · 0e68e6ea
      unknown authored
      0e68e6ea
  15. 05 Jan, 2010 1 commit