1. 29 Jan, 2010 2 commits
    • Michael Widenius's avatar
      Auto merge · 0df091f5
      Michael Widenius authored
      0df091f5
    • Michael Widenius's avatar
      Changed version number from RC to stable · c278d84b
      Michael Widenius authored
      Fixed bug in Yassle to get correct error messages in case of errors
      Provide better error messages in case of ssl connect failure
      Updated out-of-date ssl certificates to fix failing mysql-test-system (certificates now active for 10 years)
      Fixed bug in query_cache that could cause asserts and hangs in DEBUG builds.
      Fixed bug where one connection did not see changes done by another connection.
      
      configure.in:
        Changed version number from RC to stable
      extra/yassl/src/yassl_error.cpp:
        Fixed bug in Yassle to get correct error messages in case of errors
        - 'error' is an enum that hold more error numbers than the enum was defined for
      include/violite.h:
        Added error output string for sslaccept() and sslconnect() to get reason for connect failure
      mysql-test/mysql-test-run.pl:
        Write failed test cases if mysql-test-run fails because of too many errors
      mysql-test/r/grant.result:
        Update results to reflect new certificates
      mysql-test/r/openssl_1.result:
        Update results to reflect new certificates
      mysql-test/std_data/cacert.pem:
        Update ssl certificate
      mysql-test/std_data/client-cert.pem:
        Update ssl certificate
      mysql-test/std_data/client-key.pem:
        Update ssl certificate
      mysql-test/std_data/server-cert.pem:
        Update ssl certificate
      mysql-test/std_data/server-key.pem:
        Update ssl certificate
      mysql-test/t/grant.test:
        Update test to reflect new certificates
      mysql-test/t/openssl_1.test:
        Update test to reflect new certificates
      mysql-test/t/query_cache_debug.test:
        Remove 'big_test' as test is now fast
      sql-common/client.c:
        Give a better error message if ssl connect fails
      sql/net_serv.cc:
        Fixed compiler warnings
      sql/slave.cc:
        Give a better error message in logs if ssl connect fails
      sql/sql_cache.cc:
        debug_wait_for_kill() now removes the set watch variable after kill signal
        This is needed as invalidate_table() may be called twice for one query.
        Ensure that net->query_cache_query is reset after query. This fixes assert in
        query_cache_end_of_result() if query_cache_query holds results from previous query.
        Removed DBUG_ASSERT(0), as this code can be run by query_cache_debug.test
      sql/sql_connect.cc:
        Give a better error message if ssl connect fails
      sql/sql_parse.cc:
        Fixed bug where one connection did not see changes done by another connection.
        For statements that changes tables, close_thread_tables() MUST be called before
        sending OK as a table handler may not make the changes available for other connections
        before unlock_tables().
      vio/viossl.c:
        Give a better error message if ssl connect fails
      c278d84b
  2. 28 Jan, 2010 4 commits
    • unknown's avatar
      a4ecf50d
    • Michael Widenius's avatar
      Fixed compiler warnings & failing test cases · b80169ab
      Michael Widenius authored
      When compiling with debug, don't clear buffer in 'net_clear()'
      - This allows us to easier find bugs in the protocol and also get repeatable test failures in test cases where someone forgot to do --reap
      
      client/mysqltest.cc:
        Fixed compiler warning
      mysql-test/t/partition_innodb_semi_consistent.test:
        Added missing --reap (fixes random failure)
      sql/net_serv.cc:
        When compiling with debug, don't clear buffer in 'net_clear()'
        - This allows us to easier find bugs in the protocol and also get repeatable test failures in test cases where someone forgot to do --reap
      storage/myisam/ft_boolean_search.c:
        Fixed compiler warnings
      storage/myisam/ft_parser.c:
        Fixed compiler warnings
      storage/myisam/ft_stopwords.c:
        Fixed compiler warnings
      support-files/compiler_warnings.supp:
        Added a lot of new suppression of not relevant warnings and warnings in systems we are not in charge of
      unittest/mysys/waiting_threads-t.c:
        Fixed compiler warnings
      b80169ab
    • Michael Widenius's avatar
      Merge with fixes for compiler warnings and 2 fixed test cases · 943ae6ff
      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.
      943ae6ff
    • unknown's avatar
      automerge windows fixes. · 421301aa
      unknown authored
      421301aa
  3. 27 Jan, 2010 3 commits
    • Michael Widenius's avatar
      Fixed some compiler warnings and errors in test suite found by buildbot · fc8c6b55
      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)
      fc8c6b55
    • unknown's avatar
      Fix test failures due to previous change of not setting TZ by default. · 23457a33
      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.
      23457a33
    • Sergei Golubchik's avatar
      YaSSL cert info buffer overflow fix · 36769caf
      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
      36769caf
  4. 26 Jan, 2010 1 commit
  5. 22 Jan, 2010 1 commit
  6. 19 Jan, 2010 1 commit
    • unknown's avatar
      Fix Windows test failures in binlog tests in certain time zones. · 6d964ec4
      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.
      6d964ec4
  7. 18 Jan, 2010 1 commit
    • unknown's avatar
      Fixes for some randomly occuring test failures in Buildbot. · 6614eaee
      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.
      6614eaee
  8. 17 Jan, 2010 3 commits
  9. 16 Jan, 2010 1 commit
    • unknown's avatar
      Result file updates following merge of MySQL 5.1.42 and XtraDB 9. · 4f7c69fd
      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.
      4f7c69fd
  10. 15 Jan, 2010 10 commits
  11. 14 Jan, 2010 2 commits
    • Michael Widenius's avatar
      Fix for compiler warnings on windows · 08d9ffea
      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
      08d9ffea
    • Michael Widenius's avatar
      Fixed compile error on windows. · 3dba49d1
      Michael Widenius authored
      3dba49d1
  12. 12 Jan, 2010 3 commits
  13. 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... · 176ca9db
      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).
      176ca9db
  14. 09 Jan, 2010 4 commits
  15. 07 Jan, 2010 2 commits