1. 15 Jan, 2010 1 commit
    • Michael Widenius's avatar
      Merge with MySQL 5.1.42 · 07502da1
      Michael Widenius authored
      - Marked a couple of tests with --big
      - Fixed xtradb/handler/ha_innodb.cc to call explain_filename()
      
      storage/xtradb/handler/ha_innodb.cc:
        Call explain_filename() to get proper names for partitioned tables
      07502da1
  2. 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
  3. 12 Jan, 2010 3 commits
  4. 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
  5. 09 Jan, 2010 4 commits
  6. 07 Jan, 2010 3 commits
  7. 06 Jan, 2010 2 commits
    • Michael Widenius's avatar
      Removed compiler warnings · 4524a2b0
      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
      4524a2b0
    • unknown's avatar
      Automatic merge. · 921eecb1
      unknown authored
      921eecb1
  8. 05 Jan, 2010 1 commit
  9. 04 Jan, 2010 5 commits
  10. 29 Dec, 2009 2 commits
  11. 27 Dec, 2009 2 commits
    • Sergey Petrunya's avatar
      Make pbxt.join_nested test pass · 5b56db01
      Sergey Petrunya authored
      - The reason the test failed was competition between 3+ QEPs with identical
        costs. Before, two plans were competing, and that was addressed by using 
        --sorted_result on the EXPLAIN output because they were different only in 
        join order.
        Now we've got a 3rd plan which differs with "Using where" and that doesn't 
        work anymore.
      - This patch fixes it by removing 'Using where' from EXPLAIN output. Test coverage
        is somewhat reduced but probably still ok as PBXT and nested outer join processing
        have no interaction and we don't expect any bugs here.
      5b56db01
    • Michael Widenius's avatar
      Fix test suite so that it works when doing configure --without-uca · 308a5b29
      Michael Widenius authored
      Simplify testing of needed characterset
      Remove ndb from --with-plugins=max build
      mysqlbug now sends email to maria-developers@lists.launchpad.net
      
      client/mysqltest.cc:
        SKIP now expands variables (for better error messages)
      mysql-test/include/have_big5.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_collation.inc:
        Test if '$collation' is supported
      mysql-test/include/have_cp1250_ch.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_cp1251.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_cp866.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_cp932.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_eucjpms.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_euckr.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_gb2312.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_gbk.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_koi8r.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_latin2_ch.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_sjis.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_tis620.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_ucs2.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_ujis.inc:
        Simplify by using have_collation.inc
      mysql-test/include/have_utf8.inc:
        Simplify by using have_collation.inc
      mysql-test/r/create-uca.result:
        Create tests that uses unicode
      mysql-test/r/create.result:
        Move test with unicode to create-uca.test
      mysql-test/r/have_big5.require:
        Not needed anymore
      mysql-test/r/have_cp1250_ch.require:
        Not needed anymore
      mysql-test/r/have_cp1251.require:
        Not needed anymore
      mysql-test/r/have_cp866.require:
        Not needed anymore
      mysql-test/r/have_cp932.require:
        Not needed anymore
      mysql-test/r/have_eucjpms.require:
        Not needed anymore
      mysql-test/r/have_euckr.require:
        Not needed anymore
      mysql-test/r/have_gb2312.require:
        Not needed anymore
      mysql-test/r/have_gbk.require:
        Not needed anymore
      mysql-test/r/have_koi8r.require:
        Not needed anymore
      mysql-test/r/have_latin2_ch.require:
        Not needed anymore
      mysql-test/r/have_sjis.require:
        Not needed anymore
      mysql-test/r/have_tis620.require:
        Not needed anymore
      mysql-test/r/have_ucs2.require:
        Not needed anymore
      mysql-test/r/have_ujis.require:
        Not needed anymore
      mysql-test/r/have_utf8.require:
        Not needed anymore
      mysql-test/r/innodb.result:
        Move tests that depends on unicode to innodb_utf8.test
      mysql-test/r/innodb_utf8.result:
        Test moved from innodb.test
      mysql-test/suite/rpl/t/rpl_ignore_table.test:
        Test for required collations
      mysql-test/t/create-uca.test:
        Create tests that uses unicode
      mysql-test/t/create.test:
        Move test with unicode to create-uca.test
      mysql-test/t/ctype_utf8.test:
        Test that require unicode
      mysql-test/t/ddl_i18n_koi8r.test:
        Test for required collations
      mysql-test/t/ddl_i18n_utf8.test:
        Test for required collations
      mysql-test/t/fulltext.test:
        Test for required collations
      mysql-test/t/fulltext2.test:
        Test for required collations
      mysql-test/t/innodb.test:
        Move tests that depends on unicode to innodb_utf8.test
      mysql-test/t/innodb_utf8.test:
        Tests that uses unicode
      mysql-test/t/query_cache_ps_no_prot.test:
        Test for required collations
      mysql-test/t/query_cache_ps_ps_prot.test:
        Test for required collations
      scripts/mysqlbug.sh:
        Send emails to maria-developers@lists.launchpad.net
      storage/ndb/plug.in:
        Don't include ndb in 'max' builds
      308a5b29
  12. 23 Dec, 2009 1 commit
  13. 22 Dec, 2009 3 commits
    • unknown's avatar
      Ignore new pbxt symlinks. · f9fe120e
      unknown authored
      f9fe120e
    • unknown's avatar
    • unknown's avatar
      Merge fix for PBXT running inside embedded server (MBug#439889). · 6676ae68
      unknown authored
      Also some small fixes to make the PBXT testsuite work in --embedded.
      
      config/ac-macros/plugins.m4:
        MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS macro extended to support multiple files.
      mysql-test/std_data/pbxt_load_unique_error1.inc:
        Move file to be accessible also for testing embedded server.
      mysql-test/suite/pbxt/r/pbxt_bugs.result:
        Fix LOAD DATA LOCAL INFILE path so it works also for testing embedded server.
      mysql-test/suite/pbxt/t/pbxt_bugs.test:
        Fix LOAD DATA LOCAL INFILE path so it works also for testing embedded server.
      mysql-test/suite/pbxt/t/pbxt_locking.test:
        Disable for embedded, as it needs SHOW PROCESSLIST functionality not available there.
      mysql-test/suite/pbxt/t/pbxt_transactions.test:
        Disable test for embedded, as it needs ability to connect from outside (mysqldump).
      mysql-test/suite/pbxt/t/ps_1general.test:
        Fix replace_result for new mysql-test-run.pl.
      sql/sql_plugin.cc:
        Remove hack that disables PBXT in embedded.
      storage/pbxt/plug.in:
        Fix crash in PBXT in embedded server.
      storage/pbxt/src/Makefile.am:
        Remove not needed CFLAGS/CXXFLAGS (they cause autotools to generate different object names, which in turn cause the MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS replacement of object files inside library files not to work).
      storage/pbxt/src/ha_pbxt.cc:
        Ugly hack to allow more threads in embedded server (need a better fix I think).
      storage/pbxt/src/table_xt.cc:
        Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages).
      storage/pbxt/src/thread_xt.cc:
        Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages).
      storage/pbxt/src/trace_xt.cc:
        Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages).
      6676ae68
  14. 21 Dec, 2009 3 commits
  15. 16 Dec, 2009 2 commits
  16. 15 Dec, 2009 4 commits
    • Ramil Kalimullin's avatar
      Fix for bug#49517: Inconsistent behavior while using · 4cb5f047
      Ramil Kalimullin authored
      NULLable BIGINT and INT columns in comparison
      
      Problem: a consequence of the fix for 43668.
      Some Arg_comparator inner initialization missed,
      that may lead to unpredictable (wrong) comparison
      results.
      
      Fix: always properly initialize Arg_comparator
      before its usage.
      
      
      mysql-test/r/select.result:
        Fix for bug#49517: Inconsistent behavior while using 
        NULLable BIGINT and INT columns in comparison
          -test result.
      mysql-test/t/select.test:
        Fix for bug#49517: Inconsistent behavior while using 
        NULLable BIGINT and INT columns in comparison
          -test case.
      sql/item_cmpfunc.cc:
        Fix for bug#49517: Inconsistent behavior while using 
        NULLable BIGINT and INT columns in comparison
          - now all Arg_comparator::set_cmp_func() set
        Arg_comparator::set_null to ensure its proper initialization
        in all cases (by default it's set to TRUE in constructors).
      sql/item_cmpfunc.h:
        Fix for bug#49517: Inconsistent behavior while using 
        NULLable BIGINT and INT columns in comparison
          - now all Arg_comparator::set_cmp_func() set
        Arg_comparator::set_null to ensure its proper initialization
        in all cases (by default it's set to TRUE in constructors).
      4cb5f047
    • Georgi Kodinov's avatar
      Bug #48985: show create table crashes if previous access to the table · fec6586b
      Georgi Kodinov authored
        was killed
      
      Merge the fix from 5.1-bugteam to 5.1-main
      fec6586b
    • Georgi Kodinov's avatar
      Bug#49489: Uninitialized cache led to a wrong result. · 6c37da5a
      Georgi Kodinov authored
      Merge the fix from 5.1-bugteam to 5.1-main
      6c37da5a
    • Georgi Kodinov's avatar
      Bug #49480: WHERE using YEAR columns returns unexpected results · 34e5fc9c
      Georgi Kodinov authored
      Merge the fix from 5.1-bugteam to 5.1-main
      34e5fc9c