- 29 May, 2007 3 commits
-
-
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
-
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.
-
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.
-
- 28 May, 2007 2 commits
-
-
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.
-
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.
-
- 24 May, 2007 13 commits
-
-
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
-
unknown authored
-
unknown authored
-
unknown authored
into trift2.:/MySQL/M51/push-5.1
-
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.
-
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
-
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.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
-
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
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
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
-
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
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
-
- 23 May, 2007 9 commits
-
-
unknown authored
into trift2.:/MySQL/M51/push-5.1
-
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 BitKeeper/deleted/.del-CMakeLists.txt~13: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged sql/item_func.cc: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/handler.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
-
- 22 May, 2007 11 commits
-
-
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
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
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
-
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
-
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.
-
unknown authored
-
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.
-
- 21 May, 2007 2 commits
-
-
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
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
-