1. 29 May, 2007 4 commits
    • unknown's avatar
      Don't give warning that readonly variable is forced to be readonly · 441b1137
      unknown authored
      mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
      Fixed wrong reference to the mysql manual
      Fixed wrong prototype that caused some tests to fail on 64 bit platforms
      
      
      mysql-test/lib/mtr_report.pl:
        Test run now fails if we have [Warning] and [ERROR] as tags in .err file
        Added list of all common 'not fatal' errors to ignore error list
      mysql-test/mysql-test-run-shell.sh:
        Fixed some wrong startup options
      mysql-test/t/disabled.def:
        Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)
      sql/ha_ndbcluster_binlog.cc:
        Ensure we log all binglog errors with the "NDB Binlog" tag
      sql/slave.cc:
        Make errors uniform
      sql/sql_plugin.cc:
        Don't give warning that readonly variable is forced to be readonly
      sql/stacktrace.c:
        Corrected manual reference
      storage/blackhole/ha_blackhole.cc:
        Fixed wrong prototype that caused test to fail on 64 bit platforms
      storage/example/ha_example.cc:
        Fixed wrong prototype that caused test to fail on 64 bit platforms
      441b1137
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · 7f62e09d
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      client/mysqltest.c:
        Auto merged
      mysys/my_quick.c:
        Auto merged
      sql/sql_map.cc:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      7f62e09d
    • unknown's avatar
      Added casts and fixed wrong type. · 7a432ea4
      unknown authored
      
      client/mysqltest.c:
        Added casts to avoid compiler warnings.
      mysys/my_quick.c:
        Added cast to avoid compiler warning.
      sql/log.cc:
        Fixed compiler problem on Solaris.
      sql/sql_map.cc:
        Added casts to avoid compiler warnings.
      strings/ctype-ucs2.c:
        Fixed wrong type.
      7a432ea4
    • unknown's avatar
      Added casts and fixed wrong type. · 44c169f2
      unknown authored
      
      client/mysqltest.c:
        Added casts to avoid compiler warnings.
      mysys/my_quick.c:
        Added cast to avoid compiler warning.
      sql/sql_map.cc:
        Added casts to avoid compiler warnings.
      strings/ctype-ucs2.c:
        Fixed wrong type.
      44c169f2
  2. 28 May, 2007 2 commits
    • unknown's avatar
      Added casts to avoid compiler warnings and fixed a wrong type. · 29e5a66b
      unknown authored
      
      mysys/array.c:
        Added casts to avoid compiler warnings.
      mysys/hash.c:
        Added casts to avoid compiler warnings.
      sql/sql_plugin.cc:
        Fixed wrong type.
      29e5a66b
    • unknown's avatar
      Changed accidently added tabs back into spaces. · 64a82941
      unknown authored
      Fixed a bug that came in merge.
      
      
      client/mysqltest.c:
        Changed accidently added tabs back into spaces.
      mysys/array.c:
        Changed accidently added tabs back into spaces.
      sql/set_var.cc:
        Changed accidently added tabs back into spaces.
      sql/sql_insert.cc:
        Removed accidently included line in merge.
      sql/sql_yacc.yy:
        Changed accidently added tabs back into spaces.
      64a82941
  3. 24 May, 2007 13 commits
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · de6d58e6
      unknown authored
      into  linux-th5m.site:/home/my/mysql-5.1-marvel
      
      
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      de6d58e6
    • unknown's avatar
      Merged from main 5.1 · 635728a6
      unknown authored
      635728a6
    • unknown's avatar
      Raise version number after cloning 5.1.19-beta · 1d985e48
      unknown authored
      1d985e48
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · e3a3110f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      e3a3110f
    • unknown's avatar
      Makefile.am : Add "embedded" tests to the "test-bt" target. · 07ce35d2
      unknown authored
      
      Makefile.am:
        The "test-bt" target was lacking "embedded" tests -
        add them, dependent on the build of the test binary needed for them.
      07ce35d2
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6356f563
      unknown authored
      into  linux-th5m.site:/home/my/mysql-5.1-marvel
      
      
      include/keycache.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/my_static.c:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      storage/blackhole/ha_blackhole.cc:
        Auto merged
      storage/blackhole/ha_blackhole.h:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_preload.c:
        Auto merged
      mysys/mf_keycache.c:
        Manual merge from main 5.1
      6356f563
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6e849907
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/comp_err.c:
        Auto merged
      include/decimal.h:
        Auto merged
      include/my_getopt.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql.h:
        Auto merged
      mysys/array.c:
        Auto merged
      mysys/hash.c:
        Auto merged
      mysys/typelib.c:
        Auto merged
      sql/derror.cc:
        Auto merged
      sql/event_data_objects.cc:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/my_decimal.cc:
        Auto merged
      sql/my_decimal.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/rpl_utility.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_connect.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      sql/table.h:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      storage/example/ha_example.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.h:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      storage/ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      strings/decimal.c:
        Auto merged
      strings/strtod.c:
        Auto merged
      include/hash.h:
        Manual merge with 5.1 main tree.
      mysys/my_getopt.c:
        Manual merge with 5.1 main tree.
      sql/field.h:
        Manual merge with 5.1 main tree.
      sql/ha_ndbcluster.cc:
        Manual merge with 5.1 main tree.
      sql/item_cmpfunc.h:
        Manual merge with 5.1 main tree.
      sql/item_create.cc:
        Manual merge with 5.1 main tree.
      sql/item_func.h:
        Manual merge with 5.1 main tree.
      sql/key.cc:
        Manual merge with 5.1 main tree.
      sql/lock.cc:
        Manual merge with 5.1 main tree.
      sql/mysqld.cc:
        Manual merge with 5.1 main tree.
      sql/set_var.cc:
        Manual merge with 5.1 main tree.
      sql/set_var.h:
        Manual merge with 5.1 main tree.
      sql/sql_base.cc:
        Manual merge with 5.1 main tree.
      sql/sql_handler.cc:
        Manual merge with 5.1 main tree.
      sql/sql_insert.cc:
        Manual merge with 5.1 main tree.
      sql/sql_plugin.cc:
        Manual merge with 5.1 main tree.
      sql/sql_table.cc:
        Manual merge with 5.1 main tree.
      sql/sql_yacc.yy:
        Manual merge with 5.1 main tree.
      sql/table.cc:
        Manual merge with 5.1 main tree.
      storage/innobase/handler/ha_innodb.cc:
        Manual merge with 5.1 main tree.
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Manual merge with 5.1 main tree.
      storage/ndb/tools/restore/restore_main.cpp:
        Manual merge with 5.1 main tree.
      6e849907
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 160d6794
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      160d6794
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · b5e17f5d
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      b5e17f5d
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 06297270
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      06297270
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · ce5d7af1
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      ce5d7af1
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 6df02cf7
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      6df02cf7
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 37f1e222
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
      
      
      37f1e222
  4. 23 May, 2007 9 commits
  5. 22 May, 2007 11 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2d95236b
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/common/transporter/Packer.cpp:
        Auto merged
      storage/ndb/src/common/transporter/TCP_Transporter.hpp:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        manual merge
      storage/ndb/test/run-test/daily-basic-tests.txt:
        manual merge
      2d95236b
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · d06875b3
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      d06875b3
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · b8dc4b63
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      b8dc4b63
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · f529d18b
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      f529d18b
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 05464a4f
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      05464a4f
    • unknown's avatar
      Merge trift2.:/MySQL/M50/bug26609-5.0 · fd5b27e1
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      fd5b27e1
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · b19ae71c
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/pgman.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        manual merge
      b19ae71c
    • unknown's avatar
      Bug #28593 cluster backup scans in acc index order, bad for disk data · f77ba282
      unknown authored
      - change to scan in tup and disk order (if applicable)
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        tup scan for backup also, not only lcp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        choose disk order scan for disktables during backup
        + move bug workaround for 27776 from tup to lqh
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        add missing jamEntry
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        move bug workaround for 27776 from tup to lqh
      storage/ndb/src/kernel/blocks/pgman.cpp:
        missing jamEntry
      f77ba282
    • unknown's avatar
      Merge trift2.:/MySQL/M50/bug26609-5.0 · cd0fcf34
      unknown authored
      into  trift2.:/MySQL/M51/bug26609-5.1
      
      
      Makefile.am:
        Manual merge: Include the "row_lock" suite in the "test-bt" target.
      scripts/make_binary_distribution.sh:
        Manual merge: Include the additional test suites in the binary package.
      cd0fcf34
    • unknown's avatar
    • unknown's avatar
      scripts/make_binary_distribution.sh : · c7c3d169
      unknown authored
      Include all the additional test suites in the binary packages ("tar.gz").
      This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
      
      
      scripts/make_binary_distribution.sh:
        Include all the additional test suites (for now: "funcs_1", "funcs_2", "row_lock")
        in the binary packages ("tar.gz").
        Take them "as is", without any file filtering (except for the BK subdirectories "SCCS").
        
        This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
        
        Use this opportunity to correct the language in some comments.
      c7c3d169
  6. 21 May, 2007 1 commit
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 1269a52d
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
      
      
      configure.in:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      1269a52d