1. 17 Oct, 2005 18 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 22af54a9
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
      
      
      22af54a9
    • unknown's avatar
      BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table · 955798d2
      unknown authored
      Applying patch from Marko.
      All tests pass in pentium-debug-max build on Linux.
      
      
      innobase/include/rem0rec.h:
        BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
        Applying patch from Marko.
      innobase/include/rem0rec.ic:
        BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
        Applying patch from Marko.
      innobase/row/row0upd.c:
        BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
        Applying patch from Marko.
      955798d2
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · dddc50f2
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      dddc50f2
    • unknown's avatar
      Bug #13377. Small update, code formatting. · c1a658cd
      unknown authored
      c1a658cd
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · b63b06dc
      unknown authored
      into  selena.:H:/MYSQL/src/#13377-mysql-5.0
      
      
      mysql-test/include/check_var_limit.inc:
        Auto merged
      mysql-test/include/have_big5.inc:
        Auto merged
      mysql-test/include/have_compress.inc:
        Auto merged
      mysql-test/include/have_crypt.inc:
        Auto merged
      mysql-test/include/have_outfile.inc:
        Auto merged
      mysql-test/include/have_query_cache.inc:
        Auto merged
      mysql-test/include/have_tis620.inc:
        Auto merged
      mysql-test/include/have_ucs2.inc:
        Auto merged
      mysql-test/include/have_ujis.inc:
        Auto merged
      mysql-test/include/not_embedded.inc:
        Auto merged
      mysql-test/include/system_db_struct.inc:
        Auto merged
      mysql-test/include/test_outfile.inc:
        Auto merged
      mysql-test/r/greedy_optimizer.result:
        Auto merged
      mysql-test/r/index_merge.result:
        Auto merged
      mysql-test/r/index_merge_bdb.result:
        Auto merged
      mysql-test/r/index_merge_innodb.result:
        Auto merged
      mysql-test/r/index_merge_innodb2.result:
        Auto merged
      mysql-test/r/index_merge_ror.result:
        Auto merged
      mysql-test/r/index_merge_ror_cpk.result:
        Auto merged
      mysql-test/r/join_nested.result:
        Auto merged
      mysql-test/r/rowid_order_bdb.result:
        Auto merged
      mysql-test/r/rowid_order_innodb.result:
        Auto merged
      mysql-test/r/rpl_session_var.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/sum_distinct.result:
        Auto merged
      mysql-test/std_data/des_key_file:
        Auto merged
      mysql-test/std_data/init_file.dat:
        Auto merged
      mysql-test/std_data/loaddata1.dat:
        Auto merged
      mysql-test/std_data/loaddata2.dat:
        Auto merged
      mysql-test/std_data/loaddata3.dat:
        Auto merged
      mysql-test/std_data/loaddata4.dat:
        Auto merged
      mysql-test/std_data/rpl_loaddata.dat:
        Auto merged
      mysql-test/std_data/rpl_loaddata2.dat:
        Auto merged
      mysql-test/std_data/warnings_loaddata.dat:
        Auto merged
      mysql-test/t/greedy_optimizer.test:
        Auto merged
      mysql-test/t/index_merge.test:
        Auto merged
      mysql-test/t/index_merge_bdb.test:
        Auto merged
      mysql-test/t/index_merge_innodb.test:
        Auto merged
      mysql-test/t/index_merge_innodb2.test:
        Auto merged
      mysql-test/t/index_merge_ror.test:
        Auto merged
      mysql-test/t/index_merge_ror_cpk.test:
        Auto merged
      mysql-test/t/join_nested.test:
        Auto merged
      mysql-test/t/rowid_order_bdb.test:
        Auto merged
      mysql-test/t/rowid_order_innodb.test:
        Auto merged
      mysql-test/t/rpl_session_var.test:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/sum_distinct.test:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      b63b06dc
    • unknown's avatar
      Small update for #13377 patch · b1338c21
      unknown authored
      
      sql/log.cc:
        Small update to apply patch to *nix builds as well
      b1338c21
    • unknown's avatar
      Turn off EOLN_NATIVE for test files · 8c2edb46
      unknown authored
      
      mysql-test/include/check_var_limit.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_big5.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_compress.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_crypt.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_outfile.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_query_cache.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_tis620.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_ucs2.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_ujis.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/not_embedded.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/system_db_struct.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/test_outfile.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/r/greedy_optimizer.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_bdb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_innodb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_innodb2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_ror.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_ror_cpk.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/join_nested.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rowid_order_bdb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rowid_order_innodb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_session_var.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp-error.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp-security.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sum_distinct.result:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/des_key_file:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/init_file.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata1.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata2.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata3.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata4.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/rpl_loaddata.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/rpl_loaddata2.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/warnings_loaddata.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/t/greedy_optimizer.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_bdb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_innodb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_innodb2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_ror.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_ror_cpk.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/join_nested.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rowid_order_bdb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rowid_order_innodb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_session_var.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp-error.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp-security.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sum_distinct.test:
        Turn off EOLN_NATIVE flag
      8c2edb46
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · ad45b9a1
      unknown authored
      into  mysql.com:/home/pem/work/bug7049/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      ad45b9a1
    • unknown's avatar
      Additional fix for BUG#7049, after review. · c8a2ff6f
      unknown authored
      Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      
      
      mysql-test/r/sp.result:
        Updated test results after fixing error handling in select.
      sql/mysqld.cc:
        Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      sql/protocol.cc:
        Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      sql/sp_rcontext.h:
        Added method for checking if the handler was found in the current context.
      sql/sql_error.cc:
        Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      c8a2ff6f
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 40017c6f
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      40017c6f
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 06f10b7f
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      06f10b7f
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · d3d218c2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      d3d218c2
    • unknown's avatar
      ndb - hugo · 1f844d35
      unknown authored
        Disable tests of lock upgrade paths that are currently unsupported
      
      
      ndb/test/ndbapi/testOperations.cpp:
        Disable lock upgrade paths that currently unsupported
      1f844d35
    • unknown's avatar
      Fix testDict -n FragmentTypeSingle T1 · f06c72f6
      unknown authored
      Init KeyDescriptor before sending to DIH, 
        make sure that its always inited
      
      
      f06c72f6
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0b7a0b85
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      0b7a0b85
    • unknown's avatar
      ndb - ndbapi testprogram bugfix · cb04d581
      unknown authored
        testBackup, fix assertion
      
      
      ndb/test/ndbapi/testBackup.cpp:
        Fetch table before verifying
      cb04d581
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 8a92bba6
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      8a92bba6
    • unknown's avatar
      Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels. For more details see · cecfe972
      unknown authored
      bug 2030. Will push a proper fix later
      
      
      server-tools/instance-manager/manager.cc:
        Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels.
      cecfe972
  2. 16 Oct, 2005 6 commits
    • unknown's avatar
      mysql-test-run.pl: · cced6ea2
      unknown authored
        Added --skip-im option handling
        Don't terminate script if IM fails to create PID file
      mtr_cases.pl:
        Added --skip-im option handling
      mtr_process.pl:
        Kill left over 'mysqld' processes started by IM
      
      
      mysql-test/lib/mtr_process.pl:
        Kill left over 'mysqld' processes started by IM
      mysql-test/lib/mtr_cases.pl:
        Added --skip-im option handling
      mysql-test/mysql-test-run.pl:
        Added --skip-im option handling
        Don't terminate script if IM fails to create PID file
      cced6ea2
    • unknown's avatar
      sp-security.result, sp.result, sp-security.test, sp.test: · ccb796a9
      unknown authored
        Test for bug#12812 moved from sp.test to sp-security.test
      
      
      mysql-test/t/sp.test:
        Test for bug#12812 moved from sp.test to sp-security.test
      mysql-test/t/sp-security.test:
        Test for bug#12812 moved from sp.test to sp-security.test
      mysql-test/r/sp.result:
        Test for bug#12812 moved from sp.test to sp-security.test
      mysql-test/r/sp-security.result:
        Test for bug#12812 moved from sp.test to sp-security.test
      ccb796a9
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · df46fd01
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      df46fd01
    • unknown's avatar
    • unknown's avatar
      mysql-test-run.pl: · 4c4c0f87
      unknown authored
        Put socket files into $opt_tmpdir, to avoid problems
        with platforms that can't handle long socket paths.
      
      
      mysql-test/mysql-test-run.pl:
        Put socket files into $opt_tmpdir, to avoid problems
        with platforms that can't handle long socket paths.
      4c4c0f87
    • unknown's avatar
      thread_registry.h, thread_registry.cc: · 3e68a46a
      unknown authored
        Add explicit Thread_info::Thread_info() and move both
        initializers out of class definition, to solve link
        problem on QNX
      Makefile.am:
        Preserve executable mode on scripts
      make_binary_distribution.sh:
        Copy *.imtest files
      
      
      scripts/make_binary_distribution.sh:
        Copy *.imtest files
      mysql-test/Makefile.am:
        Preserve executable mode on scripts
      server-tools/instance-manager/thread_registry.cc:
        Add explicit Thread_info::Thread_info() and move both
        initializers out of class definition, to solve link
        problem on QNX
      server-tools/instance-manager/thread_registry.h:
        Add explicit Thread_info::Thread_info() and move both
        initializers out of class definition, to solve link
        problem on QNX
      3e68a46a
  3. 15 Oct, 2005 2 commits
  4. 14 Oct, 2005 14 commits