Commit graph

592 commits

Author SHA1 Message Date
unknown
1f49670a2e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
sql/gen_lex_hash.cc:
  Auto merged
2006-08-23 18:37:04 -04:00
unknown
f98d253d70 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union
sql/gen_lex_hash.cc:
  Auto merged
2006-08-23 18:29:44 -04:00
unknown
336250e60d String broken up to avoid silly MICROS~1 string-size limit.
BitKeeper/etc/ignore:
  Added sql/f.c to the ignore list
2006-08-23 18:29:05 -04:00
unknown
66fb56f115 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337
into  example.com:/work/mysql-5.1-runtime-wl3337


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp_notembedded.result:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/errmsg.txt:
  C
mysql-test/r/events_bugs.result:
  update result
  manual merge
mysql-test/r/ps_1general.result:
  update result
  manual merge
sql/sql_yacc.yy:
  manual merge
2006-08-14 15:26:59 +02:00
unknown
f68085c4e7 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
  Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
dbug/dbug.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_compress.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqlcheck.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.h:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
mysql-test/r/im_life_cycle.result:
  e
  use local
mysql-test/r/ps.result:
  use local
client/Makefile.am:
  Manual merge.
client/mysqlimport.c:
  Manual merge.
configure.in:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/mysqldump.result:
  Manual merge.
mysql-test/r/mysqltest.result:
  Manual merge.
mysql-test/r/ndb_basic.result:
  Manual merge.
mysql-test/r/rpl_view.result:
  Manual merge.
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/r/sp-error.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/union.result:
  Manual merge.
mysql-test/t/mysqldump.test:
  Manual merge.
mysql-test/t/mysqltest.test:
  Manual merge.
mysql-test/t/ndb_basic.test:
  Manual merge.
mysql-test/t/rpl_sp.test:
  Manual merge.
mysql-test/t/rpl_view.test:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
mysql-test/t/sp-error.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/item_sum.cc:
  Manual merge.
sql/mysql_priv.h:
  Manual merge.
sql/sp_head.cc:
  Manual merge.
sql/sql_db.cc:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
2006-08-12 21:06:51 +04:00
unknown
dcb6659001 Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
The previous bug fix didn't work when using partial keys.
Don't use GNUC min/max operations are they are depricated.
Fixed valgrind warning


BitKeeper/etc/ignore:
  Added */.libs/*
include/my_global.h:
  Don't use GNUC min/max operations are they are depricated
myisam/mi_rkey.c:
  Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
  The previous bug fix didn't work when using partial keys.
myisam/mi_test_all.res:
  Updated results to match mi_test_all.sh
myisam/mi_test_all.sh:
  Removed confusing warning
mysql-test/r/myisam.result:
  Added test case for #14400
mysql-test/t/myisam.test:
  Added test case for #14400
sql/sql_select.cc:
  Fixed valgrind warning (in field_string::val_int())
2006-08-10 22:41:19 +03:00
unknown
381fdf1a67 Merge gbichot3.local:/home/mysql_src/mysql-5.1-2
into  gbichot3.local:/home/mysql_src/mysql-maria; I'll fix manually.


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_static.c:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
include/my_handler.h:
  these ones I'll remove right away
mysys/my_handler.c:
  merge
sql/mysql_priv.h:
  merge
sql/set_var.cc:
  merge
storage/csv/ha_tina.cc:
  merge
storage/myisam/myisamdef.h:
  merge
2006-08-09 15:27:38 +02:00
unknown
fc19d19d4a Fix a bug in the .dsp file. Ignore a symlink.
BitKeeper/etc/ignore:
  Added ndb/src/common/util/testBitmask.cpp to the ignore list
VC++Files/sql/mysqld.dsp:
  Fix a bug in the .dsp file.
2006-08-04 00:00:48 +04:00
unknown
5b6016c14e Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/federated.result:
  Use local.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/federated.test:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
storage/myisam/mi_create.c:
  Manual merge.
2006-07-26 23:33:25 +04:00
unknown
3c3f9d9022 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysys/my_handler.c:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/hp_test1.c:
  Auto merged
storage/heap/hp_test2.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/table.cc:
  Use local (manual merge)
mysql-test/mysql-test-run.sh:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
2006-07-13 22:09:36 +04:00
unknown
d65ab09c4d update to ease the patch process
sql/event_queue.cc:
  integrate Event_queue::check_system_tables() into the boot procedure
sql/event_queue.h:
  make Event_queue::check_system_tables() void, instead of bool
BitKeeper/etc/ignore:
  Added sql/.deps/client.Po sql/.deps/derror.Po sql/.deps/des_key_file.Po sql/.deps/discover.Po sql/.deps/event_data_objects.Po sql/.deps/event_db_repository.Po sql/.deps/event_queue.Po sql/.deps/event_scheduler.Po sql/.deps/events.Po sql/.deps/field.Po sql/.deps/field_conv.Po sql/.deps/filesort.Po sql/.deps/gen_lex_hash.Po sql/.deps/gstream.Po sql/.deps/ha_berkeley.Po sql/.deps/ha_federated.Po sql/.deps/ha_heap.Po sql/.deps/ha_innodb.Po sql/.deps/ha_myisam.Po sql/.deps/ha_myisammrg.Po sql/.deps/ha_ndbcluster.Po sql/.deps/ha_ndbcluster_binlog.Po sql/.deps/ha_partition.Po sql/.deps/handler.Po sql/.deps/hash_filo.Po sql/.deps/hostname.Po sql/.deps/init.Po sql/.deps/item.Po sql/.deps/item_buff.Po sql/.deps/item_cmpfunc.Po sql/.deps/item_create.Po sql/.deps/item_func.Po sql/.deps/item_geofunc.Po sql/.deps/item_row.Po sql/.deps/item_strfunc.Po sql/.deps/item_subselect.Po sql/.deps/item_sum.Po sql/.deps/item_timefunc.Po sql/.deps/item_uniq.Po sql/.deps/item_xmlfunc.Po sql/.deps/key.Po sql/.deps/lock.Po sql/.deps/
  log.Po sql/.deps/log_event.Po sql/.deps/mf_iocache.Po sql/.deps/mini_client_errors.Po sql/.deps/my_decimal.Po sql/.deps/my_lock.Po sql/.deps/my_time.Po sql/.deps/my_user.Po sql/.deps/mysql_tzinfo_to_sql.Po sql/.deps/mysqld.Po sql/.deps/net_serv.Po sql/.deps/opt_range.Po sql/.deps/opt_sum.Po sql/.deps/pack.Po sql/.deps/parse_file.Po sql/.deps/partition_info.Po sql/.deps/password.Po sql/.deps/procedure.Po sql/.deps/protocol.Po sql/.deps/records.Po sql/.deps/repl_failsafe.Po sql/.deps/rpl_filter.Po sql/.deps/rpl_injector.Po sql/.deps/rpl_tblmap.Po sql/.deps/set_var.Po sql/.deps/slave.Po sql/.deps/sp.Po sql/.deps/sp_cache.Po sql/.deps/sp_head.Po sql/.deps/sp_pcontext.Po sql/.deps/sp_rcontext.Po sql/.deps/spatial.Po sql/.deps/sql_acl.Po sql/.deps/sql_analyse.Po sql/.deps/sql_base.Po sql/.deps/sql_binlog.Po sql/.deps/sql_builtin.Po sql/.deps/sql_cache.Po sql/.deps/sql_class.Po sql/.deps/sql_client.Po sql/.deps/sql_crypt.Po sql/.deps/sql_cursor.Po sql/.deps/sql_db.Po sql/.deps/sql_delete.Po sql/.deps/sql_derived
  .Po sql/.deps/sql_do.Po sql/.deps/sql_error.Po sql/.deps/sql_handler.Po sql/.deps/sql_help.Po sql/.deps/sql_insert.Po sql/.deps/sql_lex.Po sql/.deps/sql_list.Po sql/.deps/sql_load.Po sql/.deps/sql_manager.Po sql/.deps/sql_map.Po sql/.deps/sql_olap.Po sql/.deps/sql_parse.Po sql/.deps/sql_partition.Po sql/.deps/sql_plugin.Po sql/.deps/sql_prepare.Po sql/.deps/sql_rename.Po sql/.deps/sql_repl.Po sql/.deps/sql_select.Po sql/.deps/sql_show.Po sql/.deps/sql_state.Po sql/.deps/sql_string.Po sql/.deps/sql_table.Po sql/.deps/sql_tablespace.Po sql/.deps/sql_test.Po sql/.deps/sql_trigger.Po sql/.deps/sql_udf.Po sql/.deps/sql_union.Po sql/.deps/sql_update.Po sql/.deps/sql_view.Po sql/.deps/sql_yacc.Po sql/.deps/stacktrace.Po sql/.deps/strfunc.Po sql/.deps/table.Po sql/.deps/thr_malloc.Po sql/.deps/time.Po sql/.deps/tztime.Po sql/.deps/udf_example.Plo sql/.deps/uniques.Po sql/.deps/unireg.Po sql/.libs/udf_example.lai sql/.libs/udf_example.so.0 sql/.libs/udf_example.so.0.0.0 storage/archive/.deps/archive_test-archive_t
  est.Po storage/archive/.deps/archive_test-azio.Po storage/archive/.deps/ha_archive_la-azio.Plo storage/archive/.deps/ha_archive_la-ha_archive.Plo storage/archive/.deps/libarchive_a-azio.Po storage/archive/.deps/libarchive_a-ha_archive.Po storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po storage/csv/.deps/ha_csv_la-ha_tina.Plo storage/csv/.deps/libcsv_a-ha_tina.Po storage/example/.deps/ha_example_la-ha_example.Plo storage/example/.deps/libexample_a-ha_example.Po storage/heap/.deps/_check.Po storage/heap/.deps/_rectest.Po storage/heap/.deps/hp_block.Po storage/heap/.deps/hp_clear.Po storage/heap/.deps/hp_close.Po storage/heap/.deps/hp_create.Po storage/heap/.deps/hp_delete.Po storage/heap/.deps/hp_extra.Po storage/heap/.deps/hp_hash.Po storage/heap/.deps/hp_info.Po storage/heap/.deps/hp_open.Po storage/heap/.deps/hp_panic.Po storage/heap/.deps/hp_rename.Po storage/heap/.deps/hp_rfirst.Po storage/heap/.deps/hp_rkey.Po storage/heap/.deps/hp_rlast.P
  o storage/heap/.deps/hp_rnext.Po storage/heap/.deps/hp_rprev.Po storage/heap/.deps/hp_rrnd.Po storage/heap/.deps/hp_rsame.Po storage/heap/.deps/hp_scan.Po storage/heap/.deps/hp_static.Po storage/heap/.deps/hp_test1.Po storage/heap/.deps/hp_test2.Po storage/heap/.deps/hp_update.Po storage/heap/.deps/hp_write.Po storage/innobase/btr/.deps/btr0btr.Po storage/innobase/btr/.deps/btr0cur.Po storage/innobase/btr/.deps/btr0pcur.Po storage/innobase/btr/.deps/btr0sea.Po storage/innobase/buf/.deps/buf0buf.Po storage/innobase/buf/.deps/buf0flu.Po storage/innobase/buf/.deps/buf0lru.Po storage/innobase/buf/.deps/buf0rea.Po storage/innobase/data/.deps/data0data.Po storage/innobase/data/.deps/data0type.Po storage/innobase/dict/.deps/dict0boot.Po storage/innobase/dict/.deps/dict0crea.Po storage/innobase/dict/.deps/dict0dict.Po storage/innobase/dict/.deps/dict0load.Po storage/innobase/dict/.deps/dict0mem.Po storage/innobase/dyn/.deps/dyn0dyn.Po storage/innobase/eval/.deps/eval0eval.Po storage/innobase/eval/.deps/eval0proc.
  Po storage/innobase/fil/.deps/fil0fil.Po storage/innobase/fsp/.deps/fsp0fsp.Po storage/innobase/fut/.deps/fut0fut.Po storage/innobase/fut/.deps/fut0lst.Po storage/innobase/ha/.deps/ha0ha.Po storage/innobase/ha/.deps/hash0hash.Po storage/innobase/ibuf/.deps/ibuf0ibuf.Po storage/innobase/lock/.deps/lock0lock.Po storage/innobase/log/.deps/log0log.Po storage/innobase/log/.deps/log0recv.Po storage/innobase/mach/.deps/mach0data.Po storage/innobase/mem/.deps/mem0mem.Po storage/innobase/mem/.deps/mem0pool.Po storage/innobase/mtr/.deps/mtr0log.Po storage/innobase/mtr/.deps/mtr0mtr.Po storage/innobase/os/.deps/os0file.Po storage/innobase/os/.deps/os0proc.Po storage/innobase/os/.deps/os0sync.Po storage/innobase/os/.deps/os0thread.Po storage/innobase/page/.deps/page0cur.Po storage/innobase/page/.deps/page0page.Po storage/innobase/pars/.deps/lexyy.Po storage/innobase/pars/.deps/pars0grm.Po storage/innobase/pars/.deps/pars0opt.Po storage/innobase/pars/.deps/pars0pars.Po storage/innobase/pars/.deps/pars0sym.Po storage/i
  nnobase/que/.deps/que0que.Po storage/innobase/read/.deps/read0read.Po storage/innobase/rem/.deps/rem0cmp.Po storage/innobase/rem/.deps/rem0rec.Po storage/innobase/row/.deps/row0ins.Po storage/innobase/row/.deps/row0mysql.Po storage/innobase/row/.deps/row0purge.Po storage/innobase/row/.deps/row0row.Po storage/innobase/row/.deps/row0sel.Po storage/innobase/row/.deps/row0uins.Po storage/innobase/row/.deps/row0umod.Po storage/innobase/row/.deps/row0undo.Po storage/innobase/row/.deps/row0upd.Po storage/innobase/row/.deps/row0vers.Po storage/innobase/srv/.deps/srv0que.Po storage/innobase/srv/.deps/srv0srv.Po storage/innobase/srv/.deps/srv0start.Po storage/innobase/sync/.deps/sync0arr.Po storage/innobase/sync/.deps/sync0rw.Po storage/innobase/sync/.deps/sync0sync.Po storage/innobase/thr/.deps/thr0loc.Po storage/innobase/trx/.deps/trx0purge.Po storage/innobase/trx/.deps/trx0rec.Po storage/innobase/trx/.deps/trx0roll.Po storage/innobase/trx/.deps/trx0rseg.Po storage/innobase/trx/.deps/trx0sys.Po storage/innobase/t
  rx/.deps/trx0trx.Po storage/innobase/trx/.deps/trx0undo.Po storage/innobase/usr/.deps/usr0sess.Po storage/innobase/ut/.deps/ut0byte.Po storage/innobase/ut/.deps/ut0dbg.Po storage/innobase/ut/.deps/ut0list.Po storage/innobase/ut/.deps/ut0mem.Po storage/innobase/ut/.deps/ut0rnd.Po storage/innobase/ut/.deps/ut0ut.Po storage/innobase/ut/.deps/ut0vec.Po storage/innobase/ut/.deps/ut0wqueue.Po storage/myisam/.deps/ft_boolean_search.Po storage/myisam/.deps/ft_nlq_search.Po storage/myisam/.deps/ft_parser.Po storage/myisam/.deps/ft_static.Po storage/myisam/.deps/ft_stopwords.Po storage/myisam/.deps/ft_update.Po storage/myisam/.deps/mi_cache.Po storage/myisam/.deps/mi_changed.Po storage/myisam/.deps/mi_check.Po storage/myisam/.deps/mi_checksum.Po storage/myisam/.deps/mi_close.Po storage/myisam/.deps/mi_create.Po storage/myisam/.deps/mi_dbug.Po storage/myisam/.deps/mi_delete.Po storage/myisam/.deps/mi_delete_all.Po storage/myisam/.deps/mi_delete_table.Po storage/myisam/.deps/mi_dynrec.Po storage/myisam/.deps/mi_extra
  .Po storage/myisam/.deps/mi_info.Po storage/myisam/.deps/mi_key.Po storage/myisam/.deps/mi_keycache.Po storage/myisam/.deps/mi_locking.Po storage/myisam/.deps/mi_log.Po storage/myisam/.deps/mi_open.Po storage/myisam/.deps/mi_packrec.Po storage/myisam/.deps/mi_page.Po storage/myisam/.deps/mi_panic.Po storage/myisam/.deps/mi_preload.Po storage/myisam/.deps/mi_range.Po storage/myisam/.deps/mi_rename.Po storage/myisam/.deps/mi_rfirst.Po storage/myisam/.deps/mi_rkey.Po storage/myisam/.deps/mi_rlast.Po storage/myisam/.deps/mi_rnext.Po storage/myisam/.deps/mi_rnext_same.Po storage/myisam/.deps/mi_rprev.Po storage/myisam/.deps/mi_rrnd.Po storage/myisam/.deps/mi_rsame.Po storage/myisam/.deps/mi_rsamepos.Po storage/myisam/.deps/mi_scan.Po storage/myisam/.deps/mi_search.Po storage/myisam/.deps/mi_static.Po storage/myisam/.deps/mi_statrec.Po storage/myisam/.deps/mi_test1.Po storage/myisam/.deps/mi_test2.Po storage/myisam/.deps/mi_test3.Po storage/myisam/.deps/mi_unique.Po storage/myisam/.deps/mi_update.Po storage/myi
  sam/.deps/mi_write.Po storage/myisam/.deps/myisam_ftdump.Po storage/myisam/.deps/myisamchk.Po storage/myisam/.deps/myisamlog.Po storage/myisam/.deps/myisampack.Po storage/myisam/.deps/rt_index.Po storage/myisam/.deps/rt_key.Po storage/myisam/.deps/rt_mbr.Po storage/myisam/.deps/rt_split.Po storage/myisam/.deps/rt_test.Po storage/myisam/.deps/sort.Po storage/myisam/.deps/sp_key.Po storage/myisam/.deps/sp_test.Po storage/myisammrg/.deps/myrg_close.Po storage/myisammrg/.deps/myrg_create.Po storage/myisammrg/.deps/myrg_delete.Po storage/myisammrg/.deps/myrg_extra.Po storage/myisammrg/.deps/myrg_info.Po storage/myisammrg/.deps/myrg_locking.Po storage/myisammrg/.deps/myrg_open.Po storage/myisammrg/.deps/myrg_panic.Po storage/myisammrg/.deps/myrg_queue.Po storage/myisammrg/.deps/myrg_range.Po storage/myisammrg/.deps/myrg_rfirst.Po storage/myisammrg/.deps/myrg_rkey.Po storage/myisammrg/.deps/myrg_rlast.Po storage/myisammrg/.deps/myrg_rnext.Po storage/myisammrg/.deps/myrg_rnext_same.Po storage/myisammrg/.deps/myrg
  _rprev.Po storage/myisammrg/.deps/myrg_rrnd.Po storage/myisammrg/.deps/myrg_rsame.Po storage/myisammrg/.deps/myrg_static.Po storage/myisammrg/.deps/myrg_update.Po storage/myisammrg/.deps/myrg_write.Po strings/.deps/bchange.Po strings/.deps/bcmp.Po strings/.deps/bfill.Po strings/.deps/bmove.Po strings/.deps/bmove512.Po strings/.deps/bmove_upp.Po strings/.deps/conf_to_src.Po strings/.deps/ctype-big5.Po strings/.deps/ctype-bin.Po strings/.deps/ctype-cp932.Po strings/.deps/ctype-czech.Po strings/.deps/ctype-euc_kr.Po strings/.deps/ctype-eucjpms.Po strings/.deps/ctype-extra.Po strings/.deps/ctype-gb2312.Po strings/.deps/ctype-gbk.Po strings/.deps/ctype-latin1.Po strings/.deps/ctype-mb.Po strings/.deps/ctype-simple.Po strings/.deps/ctype-sjis.Po strings/.deps/ctype-tis620.Po strings/.deps/ctype-uca.Po strings/.deps/ctype-ucs2.Po strings/.deps/ctype-ujis.Po strings/.deps/ctype-utf8.Po strings/.deps/ctype-win1250ch.Po strings/.deps/ctype.Po strings/.deps/decimal.Po strings/.deps/int2str.Po strings/.deps/is_prefix
  .Po strings/.deps/llstr.Po strings/.deps/longlong2str.Po strings/.deps/longlong2str_asm.Po strings/.deps/my_strchr.Po strings/.deps/my_strtoll10.Po strings/.deps/my_vsnprintf.Po strings/.deps/r_strinstr.Po strings/.deps/str2int.Po strings/.deps/str_alloc.Po strings/.deps/strappend.Po strings/.deps/strcend.Po strings/.deps/strcont.Po strings/.deps/strend.Po strings/.deps/strfill.Po strings/.deps/strinstr.Po strings/.deps/strmake.Po strings/.deps/strmov.Po strings/.deps/strnlen.Po strings/.deps/strnmov.Po strings/.deps/strstr.Po strings/.deps/strtod.Po strings/.deps/strtol.Po strings/.deps/strtoll.Po strings/.deps/strtoul.Po strings/.deps/strtoull.Po strings/.deps/strxmov.Po strings/.deps/strxnmov.Po strings/.deps/xml.Po tests/.deps/dummy.Po tests/.deps/insert_test.Po tests/.deps/mysql_client_test.Po tests/.deps/select_test.Po tests/.deps/thread_test.Po tests/.libs/lt-mysql_client_test tests/.libs/mysql_client_test unittest/examples/.deps/no_plan-t.Po unittest/examples/.deps/simple-t.Po unittest/examples/.d
  eps/skip-t.Po unittest/examples/.deps/skip_all-t.Po unittest/examples/.deps/todo-t.Po unittest/mysys/.deps/base64-t.Po unittest/mysys/.deps/bitmap-t.Po unittest/mysys/.deps/my_atomic-t.Po unittest/mytap/t/.deps/basic-t.Po unittest/mytap/.deps/tap.Po vio/.deps/dummy.Po vio/.deps/test-ssl.Po vio/.deps/test-sslclient.Po vio/.deps/test-sslserver.Po vio/.deps/vio.Po vio/.deps/viosocket.Po vio/.deps/viossl.Po vio/.deps/viosslfactories.Po client/.deps/base64.Po client/.deps/completion_hash.Po client/.deps/dummy.Po client/.deps/mf_tempdir.Po client/.deps/my_bit.Po client/.deps/my_bitmap.Po client/.deps/my_getsystime.Po client/.deps/my_new.Po client/.deps/my_user.Po client/.deps/my_vle.Po client/.deps/mysql.Po client/.deps/mysql_upgrade.Po client/.deps/mysqladmin.Po client/.deps/mysqlbinlog.Po client/.deps/mysqlcheck.Po client/.deps/mysqldump.Po client/.deps/mysqlimport.Po client/.deps/mysqlshow.Po client/.deps/mysqlslap.Po client/.deps/mysqltest.Po client/.deps/readline.Po client/.deps/sql_string.Po client/.libs/
  lt-mysql client/.libs/lt-mysqladmin client/.libs/lt-mysqlbinlog client/.libs/lt-mysqlcheck client/.libs/lt-mysqldump client/.libs/lt-mysqlimport client/.libs/lt-mysqlshow client/.libs/lt-mysqlslap client/.libs/lt-mysqltest client/.libs/mysql client/.libs/mysql_upgrade client/.libs/mysqladmin client/.libs/mysqlbinlog client/.libs/mysqlcheck client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqlshow client/.libs/mysqlslap client/.libs/mysqltest cmd-line-utils/libedit/.deps/chared.Po cmd-line-utils/libedit/.deps/common.Po cmd-line-utils/libedit/.deps/el.Po cmd-line-utils/libedit/.deps/emacs.Po cmd-line-utils/libedit/.deps/fcns.Po cmd-line-utils/libedit/.deps/fgetln.Po cmd-line-utils/libedit/.deps/help.Po cmd-line-utils/libedit/.deps/hist.Po cmd-line-utils/libedit/.deps/history.Po cmd-line-utils/libedit/.deps/key.Po cmd-line-utils/libedit/.deps/map.Po cmd-line-utils/libedit/.deps/parse.Po cmd-line-utils/libedit/.deps/prompt.Po cmd-line-utils/libedit/.deps/read.Po cmd-line-utils/libedit/.deps/readl
  ine.Po cmd-line-utils/libedit/.deps/refresh.Po cmd-line-utils/libedit/.deps/search.Po cmd-line-utils/libedit/.deps/sig.Po cmd-line-utils/libedit/.deps/strlcat.Po cmd-line-utils/libedit/.deps/strlcpy.Po cmd-line-utils/libedit/.deps/term.Po cmd-line-utils/libedit/.deps/tokenizer.Po cmd-line-utils/libedit/.deps/tty.Po cmd-line-utils/libedit/.deps/unvis.Po cmd-line-utils/libedit/.deps/vi.Po cmd-line-utils/libedit/.deps/vis.Po cmd-line-utils/readline/.deps/bind.Po cmd-line-utils/readline/.deps/callback.Po cmd-line-utils/readline/.deps/compat.Po cmd-line-utils/readline/.deps/complete.Po cmd-line-utils/readline/.deps/display.Po cmd-line-utils/readline/.deps/funmap.Po cmd-line-utils/readline/.deps/histexpand.Po cmd-line-utils/readline/.deps/histfile.Po cmd-line-utils/readline/.deps/history.Po cmd-line-utils/readline/.deps/histsearch.Po cmd-line-utils/readline/.deps/input.Po cmd-line-utils/readline/.deps/isearch.Po cmd-line-utils/readline/.deps/keymaps.Po cmd-line-utils/readline/.deps/kill.Po cmd-line-utils/readli
  ne/.deps/macro.Po cmd-line-utils/readline/.deps/mbutil.Po cmd-line-utils/readline/.deps/misc.Po cmd-line-utils/readline/.deps/nls.Po cmd-line-utils/readline/.deps/parens.Po cmd-line-utils/readline/.deps/readline.Po cmd-line-utils/readline/.deps/rltty.Po cmd-line-utils/readline/.deps/savestring.Po cmd-line-utils/readline/.deps/search.Po cmd-line-utils/readline/.deps/shell.Po cmd-line-utils/readline/.deps/signals.Po cmd-line-utils/readline/.deps/terminal.Po cmd-line-utils/readline/.deps/text.Po cmd-line-utils/readline/.deps/tilde.Po cmd-line-utils/readline/.deps/undo.Po cmd-line-utils/readline/.deps/util.Po cmd-line-utils/readline/.deps/vi_mode.Po cmd-line-utils/readline/.deps/xmalloc.Po dbug/.deps/dbug.Po dbug/.deps/dbug_analyze.Po dbug/.deps/factorial.Po dbug/.deps/my_main.Po dbug/.deps/sanity.Po extra/yassl/src/.deps/buffer.Plo extra/yassl/src/.deps/cert_wrapper.Plo extra/yassl/src/.deps/crypto_wrapper.Plo extra/yassl/src/.deps/handshake.Plo extra/yassl/src/.deps/lock.Plo extra/yassl/src/.deps/log.Plo ex
  tra/yassl/src/.deps/socket_wrapper.Plo extra/yassl/src/.deps/ssl.Plo extra/yassl/src/.deps/template_instnt.Plo extra/yassl/src/.deps/timer.Plo extra/yassl/src/.deps/yassl_error.Plo extra/yassl/src/.deps/yassl_imp.Plo extra/yassl/src/.deps/yassl_int.Plo extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo extra/yassl/taocrypt/src/.deps/libt
  aocrypt_la-hash.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo extra/yassl/taocrypt/test/.deps/test-test.Po extra/yassl/testsuite/.deps/testsuite-client.Po extra/yassl/testsuite/.deps/testsuite-echoclient.Po extra/yassl/testsuite/.deps/testsuite-echoserver.Po extra/yassl/testsuite/.deps/testsuite-server.Po extra/yassl/testsuite/.deps/testsuite-test.Po extra/yassl/testsuite/.deps/t
  estsuite-testsuite.Po extra/.deps/charset2html.Po extra/.deps/comp_err.Po extra/.deps/innochecksum.Po extra/.deps/my_print_defaults.Po extra/.deps/mysql_waitpid.Po extra/.deps/perror.Po extra/.deps/replace.Po extra/.deps/resolve_stack_dump.Po extra/.deps/resolveip.Po libmysql/.deps/array.Plo libmysql/.deps/bchange.Plo libmysql/.deps/bcmp.Plo libmysql/.deps/bmove.Plo libmysql/.deps/bmove_upp.Plo libmysql/.deps/charset-def.Plo libmysql/.deps/charset.Plo libmysql/.deps/client.Plo libmysql/.deps/conf_to_src.Po libmysql/.deps/ctype-big5.Plo libmysql/.deps/ctype-bin.Plo libmysql/.deps/ctype-cp932.Plo libmysql/.deps/ctype-czech.Plo libmysql/.deps/ctype-euc_kr.Plo libmysql/.deps/ctype-eucjpms.Plo libmysql/.deps/ctype-extra.Plo libmysql/.deps/ctype-gb2312.Plo libmysql/.deps/ctype-gbk.Plo libmysql/.deps/ctype-latin1.Plo libmysql/.deps/ctype-mb.Plo libmysql/.deps/ctype-simple.Plo libmysql/.deps/ctype-sjis.Plo libmysql/.deps/ctype-tis620.Plo libmysql/.deps/ctype-uca.Plo libmysql/.deps/ctype-ucs2.Plo libmysql/.deps/ct
  ype-ujis.Plo libmysql/.deps/ctype-utf8.Plo libmysql/.deps/ctype-win1250ch.Plo libmysql/.deps/ctype.Plo libmysql/.deps/dbug.Plo libmysql/.deps/default.Plo libmysql/.deps/default_modify.Plo libmysql/.deps/errmsg.Plo libmysql/.deps/errors.Plo libmysql/.deps/get_password.Plo libmysql/.deps/hash.Plo libmysql/.deps/int2str.Plo libmysql/.deps/is_prefix.Plo libmysql/.deps/libmysql.Plo libmysql/.deps/list.Plo libmysql/.deps/llstr.Plo libmysql/.deps/longlong2str.Plo libmysql/.deps/manager.Plo libmysql/.deps/md5.Plo libmysql/.deps/mf_cache.Plo libmysql/.deps/mf_dirname.Plo libmysql/.deps/mf_fn_ext.Plo libmysql/.deps/mf_format.Plo libmysql/.deps/mf_iocache.Plo libmysql/.deps/mf_iocache2.Plo libmysql/.deps/mf_loadpath.Plo libmysql/.deps/mf_pack.Plo libmysql/.deps/mf_path.Plo libmysql/.deps/mf_tempfile.Plo libmysql/.deps/mf_unixpath.Plo libmysql/.deps/mf_wcomp.Plo libmysql/.deps/mulalloc.Plo libmysql/.deps/my_alloc.Plo libmysql/.deps/my_chsize.Plo libmysql/.deps/my_compress.Plo libmysql/.deps/my_create.Plo libmysql/.de
  ps/my_delete.Plo libmysql/.deps/my_div.Plo libmysql/.deps/my_error.Plo libmysql/.deps/my_file.Plo libmysql/.deps/my_fopen.Plo libmysql/.deps/my_fstream.Plo libmysql/.deps/my_gethostbyname.Plo libmysql/.deps/my_getopt.Plo libmysql/.deps/my_getwd.Plo libmysql/.deps/my_init.Plo libmysql/.deps/my_lib.Plo libmysql/.deps/my_malloc.Plo libmysql/.deps/my_messnc.Plo libmysql/.deps/my_net.Plo libmysql/.deps/my_once.Plo libmysql/.deps/my_open.Plo libmysql/.deps/my_port.Plo libmysql/.deps/my_pread.Plo libmysql/.deps/my_pthread.Plo libmysql/.deps/my_read.Plo libmysql/.deps/my_realloc.Plo libmysql/.deps/my_rename.Plo libmysql/.deps/my_seek.Plo libmysql/.deps/my_sleep.Plo libmysql/.deps/my_static.Plo libmysql/.deps/my_strtoll10.Plo libmysql/.deps/my_symlink.Plo libmysql/.deps/my_thr_init.Plo libmysql/.deps/my_time.Plo libmysql/.deps/my_vsnprintf.Plo libmysql/.deps/my_write.Plo libmysql/.deps/net.Plo libmysql/.deps/pack.Plo libmysql/.deps/password.Plo libmysql/.deps/safemalloc.Plo libmysql/.deps/sha1.Plo libmysql/.deps/s
  tr2int.Plo libmysql/.deps/str_alloc.Plo libmysql/.deps/strcend.Plo libmysql/.deps/strcont.Plo libmysql/.deps/strend.Plo libmysql/.deps/strfill.Plo libmysql/.deps/string.Plo libmysql/.deps/strinstr.Plo libmysql/.deps/strmake.Plo libmysql/.deps/strmov.Plo libmysql/.deps/strnlen.Plo libmysql/.deps/strnmov.Plo libmysql/.deps/strtod.Plo libmysql/.deps/strtoll.Plo libmysql/.deps/strtoull.Plo libmysql/.deps/strxmov.Plo libmysql/.deps/strxnmov.Plo libmysql/.deps/thr_mutex.Plo libmysql/.deps/typelib.Plo libmysql/.deps/vio.Plo libmysql/.deps/viosocket.Plo libmysql/.deps/viossl.Plo libmysql/.deps/viosslfactories.Plo libmysql/.deps/xml.Plo libmysql/.libs/libmysqlclient.lai libmysql/.libs/libmysqlclient.so.15 libmysql/.libs/libmysqlclient.so.15.0.0 libmysql_r/.deps/array.Plo libmysql_r/.deps/bchange.Plo libmysql_r/.deps/bcmp.Plo libmysql_r/.deps/bmove.Plo libmysql_r/.deps/bmove_upp.Plo libmysql_r/.deps/charset-def.Plo libmysql_r/.deps/charset.Plo libmysql_r/.deps/client.Plo libmysql_r/.deps/conf_to_src.Po libmysql_r/.
  deps/ctype-big5.Plo libmysql_r/.deps/ctype-bin.Plo libmysql_r/.deps/ctype-cp932.Plo libmysql_r/.deps/ctype-czech.Plo libmysql_r/.deps/ctype-euc_kr.Plo libmysql_r/.deps/ctype-eucjpms.Plo libmysql_r/.deps/ctype-extra.Plo libmysql_r/.deps/ctype-gb2312.Plo libmysql_r/.deps/ctype-gbk.Plo libmysql_r/.deps/ctype-latin1.Plo libmysql_r/.deps/ctype-mb.Plo libmysql_r/.deps/ctype-simple.Plo libmysql_r/.deps/ctype-sjis.Plo libmysql_r/.deps/ctype-tis620.Plo libmysql_r/.deps/ctype-uca.Plo libmysql_r/.deps/ctype-ucs2.Plo libmysql_r/.deps/ctype-ujis.Plo libmysql_r/.deps/ctype-utf8.Plo libmysql_r/.deps/ctype-win1250ch.Plo libmysql_r/.deps/ctype.Plo libmysql_r/.deps/dbug.Plo libmysql_r/.deps/default.Plo libmysql_r/.deps/default_modify.Plo libmysql_r/.deps/errmsg.Plo libmysql_r/.deps/errors.Plo libmysql_r/.deps/get_password.Plo libmysql_r/.deps/hash.Plo libmysql_r/.deps/int2str.Plo libmysql_r/.deps/is_prefix.Plo libmysql_r/.deps/libmysql.Plo libmysql_r/.deps/list.Plo libmysql_r/.deps/llstr.Plo libmysql_r/.deps/longlong2str.P
  lo libmysql_r/.deps/manager.Plo libmysql_r/.deps/md5.Plo libmysql_r/.deps/mf_cache.Plo libmysql_r/.deps/mf_dirname.Plo libmysql_r/.deps/mf_fn_ext.Plo libmysql_r/.deps/mf_format.Plo libmysql_r/.deps/mf_iocache.Plo libmysql_r/.deps/mf_iocache2.Plo libmysql_r/.deps/mf_loadpath.Plo libmysql_r/.deps/mf_pack.Plo libmysql_r/.deps/mf_path.Plo libmysql_r/.deps/mf_tempfile.Plo libmysql_r/.deps/mf_unixpath.Plo libmysql_r/.deps/mf_wcomp.Plo libmysql_r/.deps/mulalloc.Plo libmysql_r/.deps/my_alloc.Plo libmysql_r/.deps/my_chsize.Plo libmysql_r/.deps/my_compress.Plo libmysql_r/.deps/my_create.Plo libmysql_r/.deps/my_delete.Plo libmysql_r/.deps/my_div.Plo libmysql_r/.deps/my_error.Plo libmysql_r/.deps/my_file.Plo libmysql_r/.deps/my_fopen.Plo libmysql_r/.deps/my_fstream.Plo libmysql_r/.deps/my_gethostbyname.Plo libmysql_r/.deps/my_getopt.Plo libmysql_r/.deps/my_getwd.Plo libmysql_r/.deps/my_init.Plo libmysql_r/.deps/my_lib.Plo libmysql_r/.deps/my_malloc.Plo libmysql_r/.deps/my_messnc.Plo libmysql_r/.deps/my_net.Plo libmys
  ql_r/.deps/my_once.Plo libmysql_r/.deps/my_open.Plo libmysql_r/.deps/my_port.Plo libmysql_r/.deps/my_pread.Plo libmysql_r/.deps/my_pthread.Plo libmysql_r/.deps/my_read.Plo libmysql_r/.deps/my_realloc.Plo libmysql_r/.deps/my_rename.Plo libmysql_r/.deps/my_seek.Plo libmysql_r/.deps/my_sleep.Plo libmysql_r/.deps/my_static.Plo libmysql_r/.deps/my_strtoll10.Plo libmysql_r/.deps/my_symlink.Plo libmysql_r/.deps/my_thr_init.Plo libmysql_r/.deps/my_time.Plo libmysql_r/.deps/my_vsnprintf.Plo libmysql_r/.deps/my_write.Plo libmysql_r/.deps/net.Plo libmysql_r/.deps/pack.Plo libmysql_r/.deps/password.Plo libmysql_r/.deps/safemalloc.Plo libmysql_r/.deps/sha1.Plo libmysql_r/.deps/str2int.Plo libmysql_r/.deps/str_alloc.Plo libmysql_r/.deps/strcend.Plo libmysql_r/.deps/strcont.Plo libmysql_r/.deps/strend.Plo libmysql_r/.deps/strfill.Plo libmysql_r/.deps/string.Plo libmysql_r/.deps/strinstr.Plo libmysql_r/.deps/strmake.Plo libmysql_r/.deps/strmov.Plo libmysql_r/.deps/strnlen.Plo libmysql_r/.deps/strnmov.Plo libmysql_r/.deps
  /strtod.Plo libmysql_r/.deps/strtoll.Plo libmysql_r/.deps/strtoull.Plo libmysql_r/.deps/strxmov.Plo libmysql_r/.deps/strxnmov.Plo libmysql_r/.deps/thr_mutex.Plo libmysql_r/.deps/typelib.Plo libmysql_r/.deps/vio.Plo libmysql_r/.deps/viosocket.Plo libmysql_r/.deps/viossl.Plo libmysql_r/.deps/viosslfactories.Plo libmysql_r/.deps/xml.Plo libmysql_r/.libs/libmysqlclient_r.lai libmysql_r/.libs/libmysqlclient_r.so.15 libmysql_r/.libs/libmysqlclient_r.so.15.0.0 libmysqld/examples/.deps/completion_hash.Po libmysqld/examples/.deps/mysql.Po libmysqld/examples/.deps/mysql_client_test.Po libmysqld/examples/.deps/mysqltest.Po libmysqld/examples/.deps/readline.Po libmysqld/.deps/client.Po libmysqld/.deps/derror.Po libmysqld/.deps/discover.Po libmysqld/.deps/emb_qcache.Po libmysqld/.deps/errmsg.Po libmysqld/.deps/event_data_objects.Po libmysqld/.deps/event_db_repository.Po libmysqld/.deps/event_queue.Po libmysqld/.deps/event_scheduler.Po libmysqld/.deps/events.Po libmysqld/.deps/field.Po libmysqld/.deps/field_conv.Po lib
  mysqld/.deps/filesort.Po libmysqld/.deps/get_password.Po libmysqld/.deps/gstream.Po libmysqld/.deps/ha_berkeley.Po libmysqld/.deps/ha_federated.Po libmysqld/.deps/ha_heap.Po libmysqld/.deps/ha_innodb.Po libmysqld/.deps/ha_myisam.Po libmysqld/.deps/ha_myisammrg.Po libmysqld/.deps/ha_ndbcluster.Po libmysqld/.deps/ha_ndbcluster_binlog.Po libmysqld/.deps/ha_partition.Po libmysqld/.deps/handler.Po libmysqld/.deps/hash_filo.Po libmysqld/.deps/hostname.Po libmysqld/.deps/init.Po libmysqld/.deps/item.Po libmysqld/.deps/item_buff.Po libmysqld/.deps/item_cmpfunc.Po libmysqld/.deps/item_create.Po libmysqld/.deps/item_func.Po libmysqld/.deps/item_geofunc.Po libmysqld/.deps/item_row.Po libmysqld/.deps/item_strfunc.Po libmysqld/.deps/item_subselect.Po libmysqld/.deps/item_sum.Po libmysqld/.deps/item_timefunc.Po libmysqld/.deps/item_uniq.Po libmysqld/.deps/item_xmlfunc.Po libmysqld/.deps/key.Po libmysqld/.deps/lib_sql.Po libmysqld/.deps/libmysql.Po libmysqld/.deps/libmysqld.Po libmysqld/.deps/lock.Po libmysqld/.deps/log
  .Po libmysqld/.deps/log_event.Po libmysqld/.deps/my_decimal.Po libmysqld/.deps/my_time.Po libmysqld/.deps/my_user.Po libmysqld/.deps/net_serv.Po libmysqld/.deps/opt_range.Po libmysqld/.deps/opt_sum.Po libmysqld/.deps/pack.Po libmysqld/.deps/parse_file.Po libmysqld/.deps/partition_info.Po libmysqld/.deps/password.Po libmysqld/.deps/procedure.Po libmysqld/.deps/protocol.Po libmysqld/.deps/records.Po libmysqld/.deps/rpl_filter.Po libmysqld/.deps/rpl_injector.Po libmysqld/.deps/set_var.Po libmysqld/.deps/sp.Po libmysqld/.deps/sp_cache.Po libmysqld/.deps/sp_head.Po libmysqld/.deps/sp_pcontext.Po libmysqld/.deps/sp_rcontext.Po libmysqld/.deps/spatial.Po libmysqld/.deps/sql_acl.Po libmysqld/.deps/sql_analyse.Po libmysqld/.deps/sql_base.Po libmysqld/.deps/sql_builtin.Po libmysqld/.deps/sql_cache.Po libmysqld/.deps/sql_class.Po libmysqld/.deps/sql_crypt.Po libmysqld/.deps/sql_cursor.Po libmysqld/.deps/sql_db.Po libmysqld/.deps/sql_delete.Po libmysqld/.deps/sql_derived.Po libmysqld/.deps/sql_do.Po libmysqld/.deps/s
  ql_error.Po libmysqld/.deps/sql_handler.Po libmysqld/.deps/sql_help.Po libmysqld/.deps/sql_insert.Po libmysqld/.deps/sql_lex.Po libmysqld/.deps/sql_list.Po libmysqld/.deps/sql_load.Po libmysqld/.deps/sql_manager.Po libmysqld/.deps/sql_map.Po libmysqld/.deps/sql_parse.Po libmysqld/.deps/sql_partition.Po libmysqld/.deps/sql_plugin.Po libmysqld/.deps/sql_prepare.Po libmysqld/.deps/sql_rename.Po libmysqld/.deps/sql_select.Po libmysqld/.deps/sql_show.Po libmysqld/.deps/sql_state.Po libmysqld/.deps/sql_string.Po libmysqld/.deps/sql_table.Po libmysqld/.deps/sql_tablespace.Po libmysqld/.deps/sql_test.Po libmysqld/.deps/sql_trigger.Po libmysqld/.deps/sql_udf.Po libmysqld/.deps/sql_union.Po libmysqld/.deps/sql_update.Po libmysqld/.deps/sql_view.Po libmysqld/.deps/sql_yacc.Po libmysqld/.deps/stacktrace.Po libmysqld/.deps/strfunc.Po libmysqld/.deps/table.Po libmysqld/.deps/thr_malloc.Po libmysqld/.deps/time.Po libmysqld/.deps/tztime.Po libmysqld/.deps/uniques.Po libmysqld/.deps/unireg.Po mysys/.deps/array.Po mysys/.d
  eps/base64.Po mysys/.deps/charset-def.Po mysys/.deps/charset.Po mysys/.deps/checksum.Po mysys/.deps/default.Po mysys/.deps/default_modify.Po mysys/.deps/errors.Po mysys/.deps/hash.Po mysys/.deps/list.Po mysys/.deps/md5.Po mysys/.deps/mf_brkhant.Po mysys/.deps/mf_cache.Po mysys/.deps/mf_dirname.Po mysys/.deps/mf_fn_ext.Po mysys/.deps/mf_format.Po mysys/.deps/mf_getdate.Po mysys/.deps/mf_iocache.Po mysys/.deps/mf_iocache2.Po mysys/.deps/mf_keycache.Po mysys/.deps/mf_keycaches.Po mysys/.deps/mf_loadpath.Po mysys/.deps/mf_pack.Po mysys/.deps/mf_path.Po mysys/.deps/mf_qsort.Po mysys/.deps/mf_qsort2.Po mysys/.deps/mf_radix.Po mysys/.deps/mf_same.Po mysys/.deps/mf_sort.Po mysys/.deps/mf_strip.Po mysys/.deps/mf_tempdir.Po mysys/.deps/mf_tempfile.Po mysys/.deps/mf_unixpath.Po mysys/.deps/mf_wcomp.Po mysys/.deps/mf_wfile.Po mysys/.deps/mulalloc.Po mysys/.deps/my_access.Po mysys/.deps/my_aes.Po mysys/.deps/my_alarm.Po mysys/.deps/my_alloc.Po mysys/.deps/my_append.Po mysys/.deps/my_atomic.Po mysys/.deps/my_bit.Po mys
  ys/.deps/my_bitmap.Po mysys/.deps/my_chsize.Po mysys/.deps/my_clock.Po mysys/.deps/my_compress.Po mysys/.deps/my_copy.Po mysys/.deps/my_crc32.Po mysys/.deps/my_create.Po mysys/.deps/my_delete.Po mysys/.deps/my_div.Po mysys/.deps/my_dup.Po mysys/.deps/my_error.Po mysys/.deps/my_file.Po mysys/.deps/my_fopen.Po mysys/.deps/my_fstream.Po mysys/.deps/my_gethostbyname.Po mysys/.deps/my_gethwaddr.Po mysys/.deps/my_getncpus.Po mysys/.deps/my_getopt.Po mysys/.deps/my_getsystime.Po mysys/.deps/my_getwd.Po mysys/.deps/my_handler.Po mysys/.deps/my_init.Po mysys/.deps/my_largepage.Po mysys/.deps/my_lib.Po mysys/.deps/my_libwrap.Po mysys/.deps/my_lock.Po mysys/.deps/my_lockmem.Po mysys/.deps/my_lread.Po mysys/.deps/my_lwrite.Po mysys/.deps/my_malloc.Po mysys/.deps/my_memmem.Po mysys/.deps/my_messnc.Po mysys/.deps/my_mkdir.Po mysys/.deps/my_mmap.Po mysys/.deps/my_net.Po mysys/.deps/my_netware.Po mysys/.deps/my_new.Po mysys/.deps/my_once.Po mysys/.deps/my_open.Po mysys/.deps/my_port.Po mysys/.deps/my_pread.Po mysys/.deps
  /my_pthread.Po mysys/.deps/my_quick.Po mysys/.deps/my_read.Po mysys/.deps/my_realloc.Po mysys/.deps/my_redel.Po mysys/.deps/my_rename.Po mysys/.deps/my_seek.Po mysys/.deps/my_semaphore.Po mysys/.deps/my_sleep.Po mysys/.deps/my_static.Po mysys/.deps/my_symlink.Po mysys/.deps/my_symlink2.Po mysys/.deps/my_sync.Po mysys/.deps/my_thr_init.Po mysys/.deps/my_vle.Po mysys/.deps/my_windac.Po mysys/.deps/my_write.Po mysys/.deps/ptr_cmp.Po mysys/.deps/queues.Po mysys/.deps/rijndael.Po mysys/.deps/safemalloc.Po mysys/.deps/sha1.Po mysys/.deps/string.Po mysys/.deps/thr_alarm.Po mysys/.deps/thr_lock.Po mysys/.deps/thr_mutex.Po mysys/.deps/thr_rwlock.Po mysys/.deps/tree.Po mysys/.deps/trie.Po mysys/.deps/typelib.Po netware/.deps/libmysqlmain.Po netware/.deps/my_manage.Po netware/.deps/mysql_install_db.Po netware/.deps/mysql_test_run.Po netware/.deps/mysqld_safe.Po plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo plugin/fulltext/.libs/mypluglib.lai plugin/fulltext/.libs/mypluglib.so.0 plugin/fulltext/.libs/myplugli
  b.so.0.0.0 pstack/.deps/bucomm.Po pstack/.deps/debug.Po pstack/.deps/filemode.Po pstack/.deps/ieee.Po pstack/.deps/linuxthreads.Po pstack/.deps/pstack.Po pstack/.deps/rddbg.Po pstack/.deps/stabs.Po regex/.deps/debug.Po regex/.deps/main.Po regex/.deps/regcomp.Po regex/.deps/regerror.Po regex/.deps/regexec.Po regex/.deps/regfree.Po regex/.deps/reginit.Po regex/.deps/split.Po server-tools/instance-manager/.deps/buffer.Po server-tools/instance-manager/.deps/command.Po server-tools/instance-manager/.deps/commands.Po server-tools/instance-manager/.deps/guardian.Po server-tools/instance-manager/.deps/instance.Po server-tools/instance-manager/.deps/instance_map.Po server-tools/instance-manager/.deps/instance_options.Po server-tools/instance-manager/.deps/liboptions_la-options.Plo server-tools/instance-manager/.deps/liboptions_la-priv.Plo server-tools/instance-manager/.deps/listener.Po server-tools/instance-manager/.deps/log.Po server-tools/instance-manager/.deps/manager.Po server-tools/instance-manager/.deps/mess
  ages.Po server-tools/instance-manager/.deps/mysql_connection.Po server-tools/instance-manager/.deps/mysqlmanager.Po server-tools/instance-manager/.deps/net_serv.Po server-tools/instance-manager/.deps/parse.Po server-tools/instance-manager/.deps/parse_output.Po server-tools/instance-manager/.deps/protocol.Po server-tools/instance-manager/.deps/thread_registry.Po server-tools/instance-manager/.deps/user_management_commands.Po server-tools/instance-manager/.deps/user_map.Po to the ignore list
sql/event_scheduler.cc:
  Whitespaces and moving around to ease the job of diff
sql/event_scheduler.h:
  init_scheduler() actually does not return anything but 0, then make it void
2006-07-13 16:24:55 +02:00
unknown
5d91dc2560 Manual merge
BitKeeper/etc/ignore:
  auto-union
mysql-test/r/events_logs_tests.result:
  Auto merged
mysql-test/t/events_logs_tests.test:
  Auto merged
mysql-test/t/events_stress.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/event_data_objects.cc:
  manual merge
sql/events.cc:
  manual merge
2006-07-10 14:42:29 +02:00
unknown
60b7f9d645 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41


BitKeeper/etc/ignore:
  auto-union
libmysqld/Makefile.am:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
2006-07-08 02:30:07 +04:00
unknown
e9775dd891 Cleanups: ignore more files.
BitKeeper/etc/ignore:
  Modify ignore list to work with BitKeeper 4
mysql-test/t/mysqldump.test:
  Fix the test for Bug#18462 to use MYSQLTEST_VARDIR instead of mysql-test/
  directory for temporary files.
2006-07-08 00:03:43 +04:00
unknown
184ff212b6 WL#2928 Date Translation NRE
(implemented by by Josh Chamas)


libmysqld/Makefile.am:
  Adding new source file
mysql-test/r/date_formats.result:
  Adding test case
mysql-test/t/date_formats.test:
  Adding test case
sql/Makefile.am:
  Adding new source file
BitKeeper/etc/ignore:
  Added libmysqld/sql_locale.cc to the ignore list
sql/item_timefunc.cc:
  Using current locale data, instead of hard coded English names.
sql/mysql_priv.h:
  Adding new type MY_LOCALE, and declaring new global variables.
sql/set_var.cc:
  Adding "lc_time_names" system variable.
sql/set_var.h:
  Adding "lc_time_names" system variable.
sql/sql_cache.cc:
  Adding lc_time_names as a query cache flag.
sql/sql_class.cc:
  Setting default locale to en_US
sql/sql_class.h:
  Adding locale variable into system_variables.
sql/sql_locale.cc:
  Adding new file with locale data for various languages
2006-07-04 17:40:40 +05:00
unknown
058cad7848 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/mysqldump.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
sql/log.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_table.cc:
  manual merge
2006-07-03 11:35:58 -04:00
unknown
0bbc6fbeb7 After merge fixes
BitKeeper/etc/ignore:
  added scripts/mysql_upgrade_shell
include/my_handler.h:
  my_handler.h should not include my_global.h
mysql-test/r/key.result:
  Update results after merge
2006-06-30 20:07:33 +03:00
unknown
0194db09e6 Fixed failing test rpl_ndb_auto_inc.test
Mark events_stress.test as 'big' as it's very slow on some machines


BitKeeper/etc/ignore:
  added server-tools/instance-manager/net_serv.cc
mysql-test/t/events_stress.test:
  Slow test: only run when using --big
mysql-test/t/rpl_ndb_auto_inc.test:
  Fix failing test
2006-06-29 03:24:33 +03:00
unknown
36daa4d971 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-06-28 20:03:46 +03:00
unknown
e4f4f9dfa5 Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex"
BitKeeper/etc/ignore:
  added *.gcno
2006-06-28 17:23:54 +03:00
unknown
d2db48c69b WL#3337 (Events new infrasctructure)
Second cut of separating parsing phase from execution phase
Separate Event_timed from parsing phase and introducing Event_parse_data.


sql/event_data_objects.cc:
  second cut,
  copy Event_timed::init_body() to Event_parse_data::init_body()
  Init the body during parsing, everything else keep as a pointer to
  Item or some other pointer to use for later initialization.
sql/event_data_objects.h:
  get the identifier as sp_name*, later will initialize our structures
sql/events.cc:
  for easy transition add temporarily parse_data, later Event_timed *et will be removed.
  Do slow transition because Event_timed is so tightly integrated that a front-attack
  by removing things from this class was unsuccessful. Do things step by step by eliminating
  dependencies. Hence, the code could be checked with the current test suite too
  (early testing)
sql/events.h:
  for easy transition add temporarily parse_data, later Event_timed *et will be removed.
  Do slow transition because Event_timed is so tightly integrated that a front-attack
  by removing things from this class was unsuccessful. Do things step by step by eliminating
  dependencies. Hence, the code could be checked with the current test suite too
  (early testing)
BitKeeper/etc/ignore:
  Added libmysql/viosocket.o.6WmSJk libmysqld/event_data_objects.cc libmysqld/event_db_repository.cc libmysqld/event_queue.cc server-tools/instance-manager/net_serv.cc to the ignore list
sql/share/errmsg.txt:
  remove this message, not used and needed for now
sql/sql_lex.h:
  for easy transition add temporarily parse_data, later Event_timed *et will be removed.
  Do slow transition because Event_timed is so tightly integrated that a front-attack
  by removing things from this class was unsuccessful. Do things step by step by eliminating
  dependencies. Hence, the code could be checked with the current test suite too
  (early testing)
sql/sql_parse.cc:
  for easy transition add temporarily parse_data, later Event_timed *et will be removed.
  Do slow transition because Event_timed is so tightly integrated that a front-attack
  by removing things from this class was unsuccessful. Do things step by step by eliminating
  dependencies. Hence, the code could be checked with the current test suite too
  (early testing)
sql/sql_yacc.yy:
  for easy transition add temporarily parse_data, later Event_timed *et will be removed.
  Do slow transition because Event_timed is so tightly integrated that a front-attack
  by removing things from this class was unsuccessful. Do things step by step by eliminating
  dependencies. Hence, the code could be checked with the current test suite too
  (early testing)
2006-06-27 10:53:26 +02:00
unknown
b1bee755a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
BitKeeper/etc/ignore:
  Added BitKeeper/etc/RESYNC_TREE to the ignore list
mysql-test/r/mysqldump.result:
  Manual merge.
mysql-test/t/mysqldump.test:
  Manual merge.
2006-06-20 17:17:04 -04:00
unknown
d898972dc0 manual merge
BitKeeper/etc/ignore:
  auto-union
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/events.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
2006-06-20 17:14:36 +02:00
unknown
4b639b6c58 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Null-merged, as this doesn't apply after 5.1.4 .  -cm
2006-06-13 16:06:35 -04:00
unknown
99438424ac Reorganize, physically the events code
Unify method naming -> create/update/drop_event
Move class Event_timed to event_timed.h
class Events is in events.h (renamed from event.h)
The implementation is in events.cc (renamed from event.h)


BitKeeper/deleted/.del-event_executor.cc~f4a4645b973838ab:
  Delete: sql/event_executor.cc
include/my_time.h:
  add a boundary
libmysqld/CMakeLists.txt:
  event.cc -> events.cc
libmysqld/Makefile.am:
  event.cc -> event.cc
sql/CMakeLists.txt:
  event.cc -> events.cc
sql/Makefile.am:
  event.cc -> events.cc
  event_priv.h -> events_priv.h
sql/event_scheduler.cc:
  event.h -> events.h
  add_event -> create_event
  replace_event -> update_event()
  event_timed_compare_q is only used in event_scheduler.cc , so moving it
  from event.cc and making it static
sql/event_scheduler.h:
  add_event -> create_event
  replace_event -> update_event
sql/event_timed.cc:
  moved extern interval_type_to_name to mysql_priv.h
sql/mysql_priv.h:
  moved my_time_compare to time.cc
sql/mysqld.cc:
  event.h -> events.h
sql/sql_db.cc:
  event.h -> events.h
sql/sql_parse.cc:
  event.h -> events.h
  class Event_timed moved to event_timed.h
sql/sql_show.cc:
  event.h -> events.h
  class Event_timed moved to event_timed.h
sql/sql_yacc.yy:
  event.h -> events.h
  class Event_timed moved to event_timed.h
sql/events.cc:
  add_event -> create_event
  replace_event -> update_event
  event_timed_compare_q moved to event_scheduler.cc
sql/events.h:
  class Event_timed moved to event_timed.h
sql/events_priv.h:
  my_time_compare moved to mysql_priv.h
  event_timed_compare_q is static in event_scheduler.cc
sql/time.cc:
  moved interval_type_to_name from event.cc to here.
BitKeeper/etc/ignore:
  Added libmysqld/events.cc to the ignore list
2006-06-08 23:07:11 +02:00
unknown
4d8dacbddc Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into  arthur.local:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
2006-06-05 12:19:53 +03:00
unknown
555eb848f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
include/heap.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
unittest/mysys/base64-t.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/t/innodb_mysql.test:
  manual merge
mysql-test/valgrind.supp:
  manual merge
sql/event.cc:
  manual merge
sql/ha_heap.cc:
  manual merge
sql/ha_myisam.cc:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster_binlog.cc:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/handler.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/handler.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/item.h:
  automatic merge
sql/item_cmpfunc.cc:
  automatic merge
sql/log_event.cc:
  manual merge
  Trivial cleanup
sql/mysql_priv.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/opt_range.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_delete.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_insert.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_load.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_select.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_show.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_update.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/blackhole/ha_blackhole.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/csv/ha_tina.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
mysql-test/valgrind.supp.orig:
  Manual merge
2006-06-04 21:05:22 +03:00
unknown
01d03e7b4b This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),

- New optional handler function introduced: reset()
  This is called after every DML statement to make it easy for a handler to
  statement specific cleanups.
  (The only case it's not called is if force the file to be closed)

- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
  should be moved to handler::reset()

- table->read_set contains a bitmap over all columns that are needed
  in the query.  read_row() and similar functions only needs to read these
  columns
- table->write_set contains a bitmap over all columns that will be updated
  in the query. write_row() and update_row() only needs to update these
  columns.
  The above bitmaps should now be up to date in all context
  (including ALTER TABLE, filesort()).

  The handler is informed of any changes to the bitmap after
  fix_fields() by calling the virtual function
  handler::column_bitmaps_signal(). If the handler does caching of
  these bitmaps (instead of using table->read_set, table->write_set),
  it should redo the caching in this code. as the signal() may be sent
  several times, it's probably best to set a variable in the signal
  and redo the caching on read_row() / write_row() if the variable was
  set.

- Removed the read_set and write_set bitmap objects from the handler class

- Removed all column bit handling functions from the handler class.
  (Now one instead uses the normal bitmap functions in my_bitmap.c instead
  of handler dedicated bitmap functions)

- field->query_id is removed. One should instead instead check
  table->read_set and table->write_set if a field is used in the query.

- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
  handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
  instead use table->read_set to check for which columns to retrieve.

- If a handler needs to call Field->val() or Field->store() on columns
  that are not used in the query, one should install a temporary
  all-columns-used map while doing so. For this, we provide the following
  functions:

  my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
  field->val();
  dbug_tmp_restore_column_map(table->read_set, old_map);

  and similar for the write map:

  my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
  field->val();
  dbug_tmp_restore_column_map(table->write_set, old_map);

  If this is not done, you will sooner or later hit a DBUG_ASSERT
  in the field store() / val() functions.
  (For not DBUG binaries, the dbug_tmp_restore_column_map() and
  dbug_tmp_restore_column_map() are inline dummy functions and should
  be optimized away be the compiler).

- If one needs to temporary set the column map for all binaries (and not
  just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
  methods) one should use the functions tmp_use_all_columns() and
  tmp_restore_column_map() instead of the above dbug_ variants.

- All 'status' fields in the handler base class (like records,
  data_file_length etc) are now stored in a 'stats' struct. This makes
  it easier to know what status variables are provided by the base
  handler.  This requires some trivial variable names in the extra()
  function.

- New virtual function handler::records().  This is called to optimize
  COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
  (stats.records is not supposed to be an exact value. It's only has to
  be 'reasonable enough' for the optimizer to be able to choose a good
  optimization path).

- Non virtual handler::init() function added for caching of virtual
  constants from engine.

- Removed has_transactions() virtual method. Now one should instead return
  HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
  transactions.

- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
  that is to be used with 'new handler_name()' to allocate the handler
  in the right area.  The xxxx_create_handler() function is also
  responsible for any initialization of the object before returning.

  For example, one should change:

  static handler *myisam_create_handler(TABLE_SHARE *table)
  {
    return new ha_myisam(table);
  }

  ->

  static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
  {
    return new (mem_root) ha_myisam(table);
  }

- New optional virtual function: use_hidden_primary_key().
  This is called in case of an update/delete when
  (table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
  but we don't have a primary key. This allows the handler to take precisions
  in remembering any hidden primary key to able to update/delete any
  found row. The default handler marks all columns to be read.

- handler::table_flags() now returns a ulonglong (to allow for more flags).

- New/changed table_flags()
  - HA_HAS_RECORDS	    Set if ::records() is supported
  - HA_NO_TRANSACTIONS	    Set if engine doesn't support transactions
  - HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
                            Set if we should mark all primary key columns for
			    read when reading rows as part of a DELETE
			    statement. If there is no primary key,
			    all columns are marked for read.
  - HA_PARTIAL_COLUMN_READ  Set if engine will not read all columns in some
			    cases (based on table->read_set)
 - HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
   			    Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
 - HA_DUPP_POS              Renamed to HA_DUPLICATE_POS
 - HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
			    Set this if we should mark ALL key columns for
			    read when when reading rows as part of a DELETE
			    statement. In case of an update we will mark
			    all keys for read for which key part changed
			    value.
  - HA_STATS_RECORDS_IS_EXACT
			     Set this if stats.records is exact.
			     (This saves us some extra records() calls
			     when optimizing COUNT(*))
			    

- Removed table_flags()
  - HA_NOT_EXACT_COUNT     Now one should instead use HA_HAS_RECORDS if
			   handler::records() gives an exact count() and
			   HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
  - HA_READ_RND_SAME	   Removed (no one supported this one)

- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()

- Renamed handler::dupp_pos to handler::dup_pos

- Removed not used variable handler::sortkey


Upper level handler changes:

- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
  cache is updated on engine creation time and updated on open.


MySQL level changes (not obvious from the above):

- DBUG_ASSERT() added to check that column usage matches what is set
  in the column usage bit maps. (This found a LOT of bugs in current
  column marking code).

- In 5.1 before, all used columns was marked in read_set and only updated
  columns was marked in write_set. Now we only mark columns for which we
  need a value in read_set.

- Column bitmaps are created in open_binary_frm() and open_table_from_share().
  (Before this was in table.cc)

- handler::table_flags() calls are replaced with handler::ha_table_flags()

- For calling field->val() you must have the corresponding bit set in
  table->read_set. For calling field->store() you must have the
  corresponding bit set in table->write_set. (There are asserts in
  all store()/val() functions to catch wrong usage)

- thd->set_query_id is renamed to thd->mark_used_columns and instead
  of setting this to an integer value, this has now the values:
  MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
  Changed also all variables named 'set_query_id' to mark_used_columns.

- In filesort() we now inform the handler of exactly which columns are needed
  doing the sort and choosing the rows.

- The TABLE_SHARE object has a 'all_set' column bitmap one can use
  when one needs a column bitmap with all columns set.
  (This is used for table->use_all_columns() and other places)

- The TABLE object has 3 column bitmaps:
  - def_read_set     Default bitmap for columns to be read
  - def_write_set    Default bitmap for columns to be written
  - tmp_set          Can be used as a temporary bitmap when needed.
  The table object has also two pointer to bitmaps read_set and write_set
  that the handler should use to find out which columns are used in which way.

- count() optimization now calls handler::records() instead of using
  handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).

- Added extra argument to Item::walk() to indicate if we should also
  traverse sub queries.

- Added TABLE parameter to cp_buffer_from_ref()

- Don't close tables created with CREATE ... SELECT but keep them in
  the table cache. (Faster usage of newly created tables).


New interfaces:

- table->clear_column_bitmaps() to initialize the bitmaps for tables
  at start of new statements.

- table->column_bitmaps_set() to set up new column bitmaps and signal
  the handler about this.

- table->column_bitmaps_set_no_signal() for some few cases where we need
  to setup new column bitmaps but don't signal the handler (as the handler
  has already been signaled about these before). Used for the momement
  only in opt_range.cc when doing ROR scans.

- table->use_all_columns() to install a bitmap where all columns are marked
  as use in the read and the write set.

- table->default_column_bitmaps() to install the normal read and write
  column bitmaps, but not signaling the handler about this.
  This is mainly used when creating TABLE instances.

- table->mark_columns_needed_for_delete(),
  table->mark_columns_needed_for_delete() and
  table->mark_columns_needed_for_insert() to allow us to put additional
  columns in column usage maps if handler so requires.
  (The handler indicates what it neads in handler->table_flags())

- table->prepare_for_position() to allow us to tell handler that it
  needs to read primary key parts to be able to store them in
  future table->position() calls.
  (This replaces the table->file->ha_retrieve_all_pk function)

- table->mark_auto_increment_column() to tell handler are going to update
  columns part of any auto_increment key.

- table->mark_columns_used_by_index() to mark all columns that is part of
  an index.  It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
  it to quickly know that it only needs to read colums that are part
  of the key.  (The handler can also use the column map for detecting this,
  but simpler/faster handler can just monitor the extra() call).

- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
  also mark all columns that is used by the given key.

- table->restore_column_maps_after_mark_index() to restore to default
  column maps after a call to table->mark_columns_used_by_index().

- New item function register_field_in_read_map(), for marking used columns
  in table->read_map. Used by filesort() to mark all used columns

- Maintain in TABLE->merge_keys set of all keys that are used in query.
  (Simplices some optimization loops)

- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
  but the field in the clustered key is not assumed to be part of all index.
  (used in opt_range.cc for faster loops)

-  dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
   tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
   mark all columns as usable.  The 'dbug_' version is primarily intended
   inside a handler when it wants to just call Field:store() & Field::val()
   functions, but don't need the column maps set for any other usage.
   (ie:: bitmap_is_set() is never called)

- We can't use compare_records() to skip updates for handlers that returns
  a partial column set and the read_set doesn't cover all columns in the
  write set. The reason for this is that if we have a column marked only for
  write we can't in the MySQL level know if the value changed or not.
  The reason this worked before was that MySQL marked all to be written
  columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
  bug'.

- open_table_from_share() does not anymore setup temporary MEM_ROOT
  object as a thread specific variable for the handler. Instead we
  send the to-be-used MEMROOT to get_new_handler().
  (Simpler, faster code)



Bugs fixed:

- Column marking was not done correctly in a lot of cases.
  (ALTER TABLE, when using triggers, auto_increment fields etc)
  (Could potentially result in wrong values inserted in table handlers
  relying on that the old column maps or field->set_query_id was correct)
  Especially when it comes to triggers, there may be cases where the
  old code would cause lost/wrong values for NDB and/or InnoDB tables.

- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
  OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
  This allowed me to remove some wrong warnings about:
  "Some non-transactional changed tables couldn't be rolled back"

- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
  (thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
  some warnings about
  "Some non-transactional changed tables couldn't be rolled back")

- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
  which could cause delete_table to report random failures.

- Fixed core dumps for some tests when running with --debug

- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
  (This has probably caused us to not properly remove temporary files after
  crash)

- slow_logs was not properly initialized, which could maybe cause
  extra/lost entries in slow log.

- If we get an duplicate row on insert, change column map to read and
  write all columns while retrying the operation. This is required by
  the definition of REPLACE and also ensures that fields that are only
  part of UPDATE are properly handled.  This fixed a bug in NDB and
  REPLACE where REPLACE wrongly copied some column values from the replaced
  row.

- For table handler that doesn't support NULL in keys, we would give an error
  when creating a primary key with NULL fields, even after the fields has been
  automaticly converted to NOT NULL.

- Creating a primary key on a SPATIAL key, would fail if field was not
  declared as NOT NULL.


Cleanups:

- Removed not used condition argument to setup_tables

- Removed not needed item function reset_query_id_processor().

- Field->add_index is removed. Now this is instead maintained in
  (field->flags & FIELD_IN_ADD_INDEX)

- Field->fieldnr is removed (use field->field_index instead)

- New argument to filesort() to indicate that it should return a set of
  row pointers (not used columns). This allowed me to remove some references
  to sql_command in filesort and should also enable us to return column
  results in some cases where we couldn't before.

- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
  bitmap, which allowed me to use bitmap functions instead of looping over
  all fields to create some needed bitmaps. (Faster and smaller code)

- Broke up found too long lines

- Moved some variable declaration at start of function for better code
  readability.

- Removed some not used arguments from functions.
  (setup_fields(), mysql_prepare_insert_check_table())

- setup_fields() now takes an enum instead of an int for marking columns
   usage.

- For internal temporary tables, use handler::write_row(),
  handler::delete_row() and handler::update_row() instead of
  handler::ha_xxxx() for faster execution.

- Changed some constants to enum's and define's.

- Using separate column read and write sets allows for easier checking
  of timestamp field was set by statement.

- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()

- Don't build table->normalized_path as this is now identical to table->path
  (after bar's fixes to convert filenames)

- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
  do comparision with the 'convert-dbug-for-diff' tool.


Things left to do in 5.1:

- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
  row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
  Mats has promised to look into this.

- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
  (I added several test cases for this, but in this case it's better that
  someone else also tests this throughly).
  Lars has promosed to do this.


BitKeeper/etc/ignore:
  added mysys/test_bitmap
include/base64.h:
  Removed my_global.h, as this must be included first in any program
include/heap.h:
  Added heap_reset() (Required by new handler interface)
include/my_base.h:
  Removed HA_EXTRA_RESET. MySQL will now call ::reset() instead of ::extra(HA_EXTRA_RESET).
  HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIVE_PRIMARY key are deleted as the column bitmaps makes these unnecessary
include/my_bitmap.h:
  Remove my_pthread.h (should be included at upper level)
  Introduced my_bitmap_map typedef to make it the bitmap handling more like a black box
  Added bitmap_is_overlapping(), bitmap_test_and_clear(), bitmap_copy() and bitmap_cmp()
  Made bitmap_set_bit(), bitmap_flip_bit(), bitmap_clear_bit() return void
include/myisam.h:
  Added mi_reset() (Required by new handler interface)
include/myisammrg.h:
  Added myrg_reset() (Required by new handler interface)
include/mysql_com.h:
  Added flag FIELD_IN_ADD_INDEX to be able to remove Field->add_index
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Added testing of CREATE ... SELECT in a mixed environment
  (This found some bugs that Mats is going to fix shortly)
mysql-test/install_test_db.sh:
  Simplify ldata usage
  Added --tmpdir=. option to mysqld bootstrap (Removed some warnings when TMPDIR was wrongly set)
mysql-test/mysql-test-run.pl:
  Added --tmpdir=. to bootstrap
mysql-test/mysql-test-run.sh:
  Use copy instead of INSTALL_DB for master and slave databases.
  (Speeds up startup time a lot!)
  Remove snapshot directories at startup (removes some strange warnings)
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Added testing of CREATE ... SELECT in a mixed environment
  (This found some bugs that Mats is going to fix shortly)
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Added testing of CREATE ... SELECT in a mixed environment
mysql-test/r/create.result:
  Some extra tests of warnings and number of tables opened by CREATE ... SELECT
mysql-test/r/federated.result:
  Drop some left over tables
  Added testing of multiple table update and multiple table delete (with and without keys)
mysql-test/r/func_gconcat.result:
  Enable some disabled tests (converted them slightly to be predictable)
mysql-test/r/func_time.result:
  Added drop of test function
mysql-test/r/innodb_mysql.result:
  Added tests for CREATE ... SELECT
mysql-test/r/insert.result:
  More tests
  Added testing of duplicate columns in insert
mysql-test/r/loaddata.result:
  Added testing LOAD DATA ... SET ...
mysql-test/r/multi_update.result:
  Test multi updates and deletes using primary key and without
mysql-test/r/ndb_index_unique.result:
  Better error message
mysql-test/r/ndb_replace.result:
  New correct result after fixing REPLACE handling with NDB
mysql-test/r/rpl_ddl.result:
  Now we don't get these (wrong) warnings anymore
mysql-test/r/view_grant.result:
  Drop used views
mysql-test/t/create.test:
  Some extra tests of warnings and number of tables opened by CREATE ... SELECT
mysql-test/t/federated.test:
  Drop some left over tables
  Added testing of multiple table update and multiple table delete (with and without keys)
mysql-test/t/func_gconcat.test:
  Enable some disabled tests (converted them slightly to be predictable)
mysql-test/t/func_time.test:
  Added drop of test function
mysql-test/t/innodb_mysql.test:
  Added tests for CREATE ... SELECT
mysql-test/t/insert.test:
  More tests
  Added testing of duplicate columns in insert
mysql-test/t/loaddata.test:
  Added testing LOAD DATA ... SET ...
mysql-test/t/multi_update.test:
  Test multi updates and deletes using primary key and without
mysql-test/t/view_grant.test:
  Drop used views
mysql-test/valgrind.supp:
  Added supression of not needed warnings when printing stack trace
mysys/base64.c:
  Include my_global.h first
mysys/my_bitmap.c:
  Added bitmap_is_overlapping(), bitmap_test_and_clear() and bitmap_copy()
  Changed logic of bitmap handling to be a bit more efficent (Did this together with Mikael Ronström)
  Now the 'extra, not used bits' in the bitmap are assumed to have a 'random value' and the bitmap functions are free to change them whenever needed.
  Changed how mutex is allocated to make 'bitmap_free()' function simpler.
mysys/thr_lock.c:
  Added 0x before thread pointers (for easier comparison of DBUG traces)
sql/event.cc:
  Ensure 'use_all_columns()' is used for event tables
  Don't print warning that event table is damaged if it doesn't exists.
sql/field.cc:
  Added ASSERT_COLUMN_MARKED_FOR_WRITE in all store() methods and ASSERT_COLUMN_MARKED_FOR_READ in all val() methods to catch wrong setting if table->read_set and table->write_set
  (Rest of changes are only indentation cleanups)
sql/field.h:
  Removed Field->query_id (replaced by table->read_set and table->write_set)
  Removed Field->fieldnr (use Field->field_index instead)
  Removed Field->add_index (Use Field->flags instead)
  Add Field->part_of_key_not_clustered (for usage in opt_range.cc)
sql/filesort.cc:
  Added paramater sort_postion to filesort() to force sorting by position instead of storing all fields in the result set.
  This allowed me to remove checking of sql_command.
  Create a temporary column bitmap for fields that are used by the sorting process.
  Use column bitmaps instead of query_id
sql/ha_berkeley.cc:
  Update to 'newer' table handler interface
sql/ha_berkeley.h:
  Update to 'newer' table handler interface
sql/ha_federated.cc:
  Update to 'newer' table handler interface
  Only read columns that are needed from remote server.
  In case of eq ranges, don't generate two conditions in the WHERE clause
  (this can still be optimized, but would require a bigger code change)
  Use 'simpler to use' XXXX_LEN' macros
  A bit simpler logic in ::write_row() when creating statements.
  In update, only include test of fields actually read.
  (This greatly simplifies the queries sent by the federated engine)
  Similar changes done for delete_row()
sql/ha_federated.h:
  Update to 'newer' table handler interface
  Changed XXX_LEN macros to use sizeof(...)-1, to simplify usage in ha_federated.cc
  Added HA_PRIMARY_KEY_REQUIRED_FOR_DELETE to tell MySQL to read all primary key columns in case of DELETE
sql/ha_heap.cc:
  Update to 'newer' table handler interface
sql/ha_heap.h:
  Update to 'newer' table handler interface
sql/ha_innodb.cc:
  Update to 'newer' table handler interface
  - Update innobase_create_handler() to new interface
  - Removed HA_NOT_EXACT_COUNT (not needed)
  - Renamed HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
  - Prefixed base status variables with 'stats'
  - Use table column bitmaps instead of ha_get_bit_in_read_set()
  - Added ::reset(), with code from ::extra(HA_EXTRA_RESET)
  - Removed HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIEVE_PRIMARY_KEY as
    the table->read_set and table->write_set bitmaps now are accurate
sql/ha_innodb.h:
  Update to 'newer' table handler interface
  - table_flags are now ulonglong
  - Added reset() method
  - Removed not needed ha_retrieve_all_cols() and ha_retrieve_all_pk() columns.
  - Made build_template() a class function to be able to easier access class variables
sql/ha_myisam.cc:
  Update to 'newer' table handler interface
sql/ha_myisam.h:
  Update to 'newer' table handler interface
sql/ha_myisammrg.cc:
  Update to 'newer' table handler interface
sql/ha_myisammrg.h:
  Update to 'newer' table handler interface
sql/ha_ndbcluster.cc:
  Update to 'newer' table handler interface
  Fixed use_blob_value() to be accurate
  In ::complemented_read() we have to check both the read and write bitmap as the old code did mark all changed columns also in the read map
  Correct dumping of field data with DBUG_DUMP
  Prefix addresses in DBUG_PRINT with 0x
  Fixed usage of not initialized memory
  Update to use field->flags & FIELD_IN_ADD_INDEX instead of field->add_index.
sql/ha_ndbcluster.h:
  Update to 'newer' table handler interface
sql/ha_ndbcluster_binlog.cc:
  Mark usage of all columns in ndbcluster binlog tables
  false -> FALSE, true -> TRUE
  Use table->s->all_set instead of creating a temporary bitmap.
sql/ha_partition.cc:
  Update to 'newer' table handler interface
  Added memroot to initialise_partitions() and related functions to get faster memory allocation.
  partition_create_handler() is now responsible for initialisation of the partition object
  Some trivial optimizations and indentation fixes
  Ensure that table_flags() are up to date
  Removed documentation for removed HA_EXTRA flags
  Fixed 'strange' usage of m_file[i] in new_handlers_from_part_info()that worked in current code 'by chance'
sql/ha_partition.h:
  Update to 'newer' table handler interface
sql/handler.cc:
  create_xxx handler now takes MEMROOT as an argument to simplify memory allocation.
  Much simpler get_new_handler()
  (Initialization of the object is now handled by the create method for the engine)
  Moved all allocation of bitmap handling to the TABLE object (in table.cc)
  Added column_bitmaps_signal() to signal column usage changes.
  Changed binlog_log_row() to use the exiusting all_set bitmap in the table object.
  Added ha_reset() function to test that the file object is ok at end of statement and call handler::reset()
  Added use_hidden_primary_key() to signal handler that we we are going to read and update + delete the row and the handler should thus remember the position for the row
sql/handler.h:
  Added HA_NO_TRANSACTIONS, HA_PARTIAL_COLUMN_READ, HA_REQUIRES_KEY_COLUMNS_FOR_DELETE,HA_PRIMARY_KEY_REQUIRED_FOR_DELETE and HA_HAS_RECORDS
  Removed HA_NOT_EXACT_COUNT, HA_READ_RND_SAME
  HA_DUPP_POS -> HA_DUPLICATE_POS
  HA_NOT_EXACT_COUNT replaced by HA_STATS_RECORDS_IS_EXACT, HA_HAS_RECORDS and records()
  HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
  Added future row type 'ROW_TYPE_PAGES'
  Added MEM_ROOT to handlerton 'create' function
  Added ha_statistics, a structure for all status variable in the base handler class.
  Moved all status variables in the handler class into a stats structs to improve readability.
  ha_table_flags() is now a cached (not virtual) version of table_flags()
  reset() doesn't anymore call extra(HA_EXTRA_RESET) but is a function of it's own.
  Renamed dupp_ref to dup_ref
  Renamed not used handler::sortkey
  Moved read_set and write_set to TABLE structure
  handler::init() function added for cacheing of virtual constants from engine.
sql/item.cc:
  Added register_field_in_read_map() for marking used columns in expression.
  This is used by filesort() for creating an optimal column bitmap while retrieving columns for sorting.
  Initalize value.cs_info.character_set_client to fix core dump bug with --debug
  set_query_id -> mark_used_columns
  Mark used columns in read_set OR write_set.
sql/item.h:
  Removed reset_query_id_processor() as it's not needed anymore.
  Added register_field_in_read_map()
  Added extra argument to Item::walk() to indicate if we should also
  traverse sub queries.
sql/item_cmpfunc.cc:
  Temporary mark used columns to be read/writable
  Update Item::walk to new interface
sql/item_cmpfunc.h:
  Added extra argument to Item::walk() to indicate if we should also traverse sub queries.
sql/item_func.cc:
  Update Item::walk() to new interface
  table_flags() -> ha_table_flags()
sql/item_func.h:
  Update Item::walk() to new interface
sql/item_row.cc:
  Update Item::walk() to new interface
sql/item_row.h:
  Update Item::walk() to new interface
sql/item_strfunc.h:
  Update Item::walk() to new interface
sql/item_subselect.cc:
  Added Item_subselect::walk()
  (It was a bug it was missing before. Not sure what kind of bugs this could have caused)
sql/item_subselect.h:
  Update Item::walk() to new interface
sql/item_sum.cc:
  Update Item::walk() to new interface
  Updates for new handler interace
sql/item_sum.h:
  Update Item::walk() to new interface
sql/key.cc:
  Updates for new handler interace
sql/log.cc:
  Mark all columns used for log tables
  Split options flag
  Ensured that second argument to trans_register_ha is a bool
sql/log_event.cc:
  Fixed comments to be withing 79 characters
  Use OPTION_KEEP_LOG instead of OPTION_STATUS_NO_TRANS_UPDATE to remove wrong warnings
  Updates for new handler interface
  Use 0x%lx instead of %p (portability problem)
sql/mysql_priv.h:
  Added OPTION_KEEP_LOG to indicate that we should replicate the binlog even on rollback
  Removed not used 'conds' argument to setup_tables
sql/mysqld.cc:
  Indentation fixes and removed old comment
sql/opt_range.cc:
  Update to new handler and bitmap interface.
  Fixed calls to cp_buffer_from_ref() and walk() (new argument).
  Create new temporary bitmaps for ror scans.
  (Needed because of handler changes and to get more accurate column bitmaps than before)
  Remove not needed file->ha_reset() call before file->close().
  Some trivial optimization and indentation fixes.
  Use Field->part_of_key_not_clustered() to check if field is part of a key, instead of looping over all key parts.
  
  Added flag 'in_ror_merged_scan' to allow ::get_next() to know that we need a special column bitmap to only fetch pointer to record.
  This is needed because ror scan uses the same TABLE object but different file objects, which creates problem for the column bitmap handling.
  (This is a temporary solution. A better one would be to allocate an own TABLE object for ROR scans)
  
  Optimized bitmap handling in ror scans:
  - Start bitmap at position 0, not 1
  - Use same bitmap size as in TABLE
  - Use table->read_set and table->write_set to create column bitmaps instead of looping over all fields in table
sql/opt_range.h:
  Added 'in_ror_merged_scan' to indicate if we are doing a ROR scan
  Added temporary column bitmaps used in ROR scans
sql/opt_sum.cc:
  Added get_ext_record_count() which is used in COUNT() optimization if handler has HA_HAS_RECORDS
  Note that we don't call this if handler has HA_STATS_RECORDS_IS_EXACT set.
sql/protocol.cc:
  We need to mark columns as readable in ::store() as we sometimes return default value for fields to the user
sql/records.cc:
  Updates for new handler interface
sql/set_var.cc:
  Handle splitting OPTION_STATUS_NO_TRANS_UPDATE to two flags
sql/share/errmsg.txt:
  Fixed wrong
sql/sp.cc:
  Mark that we are using all columns for the proc table
  Update call to setup_tables() to use new prototype
sql/sp_head.cc:
  Removed QQ comment
sql/spatial.cc:
  Removed wrong QQ comment
sql/sql_acl.cc:
  Mark that we need all columns for acl tables
  Supply memroot to some 'new' calls.
  Indentation fixes
sql/sql_base.cc:
  set_query_id removed
  Ensure we call ha_reset() at end of each statement
  Mark read columns in read_set and changed columns in write_set (Before all columns was marked in read set)
  Fixed marking of some columns that was not proplerly marked before
  Maintain in TABLE->merge_keys set of all keys that are used in some way
  Removed not used 'conds' argument from setup_tables()
  Remove not used setting of 'dupp_field' in insert_fields()
  Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
  (This has probably caused us to not properly remove temporary files after crash)
sql/sql_bitmap.h:
  Added is_overlapping()
sql/sql_class.cc:
  Slow_logs was not properly initialized, which could maybe cause extra/lost entries in slow log.
  set_query_id -> mark_used_columns
  Simpler variable usage in pack_row()  (cleanup)
  Moved some variable declartion at start of function for better code readability
sql/sql_class.h:
  Added enum_mark_columns
  Updated comments
  Renamed dupp_field -> dup_field
  Added virtual function 'can_rollback_data()' to select_insert() to be used in CREATE ... SELECT to optimize use of OPTION_STATUS_NO_TRANS_UPDATE.
  (This fixes a bug in CREATE ... SELECT where we did give wrong warnings when using non transacational tables)
sql/sql_delete.cc:
  Updates to new handler interface
  Call table->mark_columns_needed_for_delete() to allow us to put additional columns in column usage maps if handler so requires.
  Call table->prepare_for_position() to tell handler that we are going to call ha_position().
  Removed call to free_io_cache(). (io_cache is now removed in ha_reset()).
  Fixed calls to setup_tables()
sql/sql_do.cc:
  Update call to setup_fields()
sql/sql_handler.cc:
  Tell handler tables to always read all columns.
  Use temporary column map when storing value in field for later index usage
sql/sql_help.cc:
  Makr all used fields to be read
  Update call to setup_fields()
sql/sql_insert.cc:
  Tell handler we are going to update the auto_increment column
  dupp_field -> dup_field
  Set column usage bits for timestamp field.
  Call table->mark_columns_needed_for_insert() and table->mark_auto_increment_column()
  Removed not used argument from mysql_prepare_insert_check_table().
  
  If we get an duplicate row on insert, change column map to read and write all columns while retrying the operatation.
  This is required by the definition of REPLACE and also ensures that fields that are only part of UPDATE are properly handled.
  This fixed a bug in NDB and REPLACE where REPLACE wrongly copied some column values from the replaced row.
  
  Setup new bitmaps for delayed insert rows
  Remove reseting of next_number_fields as it will be reset on next call to handler_insert()
  
  Fixed usage of thd->options and OPTION_STATUS_NO_TRANS_UPDATE.
  The issue was that one should not to reset this flag as it may be set by a previous statement.
  The way it was now used caused us to loose some warnings and get other wrong warnings when using non transactional tables mixed with transactional.
  I fixed it by introducing 'select_insert::can_rollback_data' to inform send_error() that the given statement can be rolled back (which in case of CREATE TABLE can always be done)
  Don't close tables created with CREATE ... SELECT but keep them in the table cache.
  
  Moved out MY_HOOKS from inside function (better readability)
sql/sql_load.cc:
  Update to use new handler and column marking interface
  Update using setup_tables()
sql/sql_olap.cc:
  Update calls to setup_tables
  Use enums instead of constants to setup_fields()
sql/sql_parse.cc:
  Handle OPTION_KEEP_LOG:
  - Set it on CREATE TEMPORARY TABLE / DROP TABLE
  - Reset it when OPTION_STATUS_NO_TRANS_UPDATE is reset
  - Don't set it for CREATE ... SELECT (this is handled in select_create class)
  Remove reseting of OPTION_STATUS_NO_TRANS_UPDATE in begin_trans() as this should already be reset.
  If in autocommit mode, reset OPTION_KEEP_LOG and OPTION_STATUS_NO_TRANS_UPDATE to not give warnings in future commands
sql/sql_partition.cc:
  Update walk() usage
  Trivial indentation fixes
sql/sql_plugin.cc:
  Mark all columns as used for plugins
sql/sql_prepare.cc:
  Added assert to find out hidden bugs in character_set_client (got an error in debug binary when this not set correctly)
  Updates for new handler interface
  Update calls to setup_fields()
sql/sql_repl.cc:
  Indentation fixes
sql/sql_select.cc:
  Update call to setup_tables() and setup_fields()
  Remove some old disabled code
  Update to new hadler interface
  Indentation cleanups
  Added column bitmaps for temporary tables.
  Remove updating of the removed slots in the Field class
  Added TABLE argument to cp_buffer_from_ref() (To be able to install temporary column maps)
  For internal temporary tables, use handler::write_row(), handler::delete_row() and handler::update_row() instead of handler::ha_xxxx() for faster execution.
sql/sql_select.h:
  Indentaition fixes.
  Install temporary column usage maps when needed
  Added TABLE element to cp_buffer_from_ref()
sql/sql_show.cc:
  Update to new handler interface
  Mark all columns used for internal tables.
  Style fixes.
  Added support for 'future' ROW_TYPE_PAGES.
  Don't allocate TMP_TABLE_PARAM with calloc. The 'init()' function will initialize the structure properly.
sql/sql_table.cc:
  Update to new handler interface
  Simple my_snprintf -> strmake()
  Changed some constants to defines
  Don't test for NULL in primary key (as we a couple of line above force the PRIMARY KEY to be NOT NULL)
  Change field->add_index to use field->flags & FIELD_IN_ADD_INDEX
  Mark all columns as used for ALTER TABLE
  Style fixes
  Update call to filesort()
sql/sql_trigger.h:
  Added friend functions to be able to test if triggers exists for table we are going to insert/update or delete in.
sql/sql_udf.cc:
  Mark all columns as used for udf system table.
sql/sql_union.cc:
  Update call to walk()
  Update to new handler interface
sql/sql_update.cc:
  Remove query_id argument from compare_record()
  Use column bitmaps instead of query_id.
  We can't use compare_records() to skip updates for handlers that returns a partial column set and the read_set doesn't cover all columns in the write set, because compare_record() can't in this case know if a not read column changed value.
  Update call to setup_fields()
  Using separate column read and write sets allows for easier checking of timestamp field was set by statement.
  Removed call to free_io_cache() as this is now done in ha_reset()
  Call table->mark_columns_needed_for_update() and table->prepare_for_position()
  Style fixes
sql/sql_view.cc:
  Style fixes
sql/table.cc:
  Remove implicitely include 'errno.h'
  Remove code for building normalized path, as this is now identical to 'path'
  Remove field->fieldnr
  Added update of field->part_of_key_not_clustered()
  Create column bitmaps in TABLE and TABLE_SHARE
  Don't setup a temporary MEM_ROOT object as a thread specific variable for the handler. Instead we send the to-be-used MEMROOT to get_new_handler()
  Update to new handler interface
  Update call to walk()
  Added new functions:
  - st_table::clear_column_bitmaps()
  - st_table::prepare_for_position()
  - st_table::mark_columns_used_by_index()
  - st_table::restore_column_maps_after_mark_index()
  - st_table::mark_columns_used_by_index_no_reset()
  - st_table::mark_auto_increment_column()
  - st_table::mark_columns_needed_for_delete()
  - st_table::mark_columns_needed_for_update()
  - st_table::mark_columns_needed_for_insert()
sql/table.h:
  Moved column usage bitmaps from handler to TABLE
  Added to TABLE_SHARE all_set and column_bitmap_size
  Added to TABLE merge_keys, bitmap_init_values, def_read_set, def_write_set, tmp_set, read_set and write_set.
  Declared all new table column bitmap functions
  Added TABLE functions column_bitmaps_set(), column_bitmaps_set_no_signal(), use_all_columns() and default_column_bitmaps()
  Added functions: tmp_use_all_columns() and tmp_restore_column_map() to temporarly switch column bitmaps
  Added functions: dbug_tmp_use_all_columns() and dbug_tmp_restore_column_map() to temporarly switch column bitmaps to avoid asserts in Field::store() and Field::val().
sql/tztime.cc:
  Mark all columns as used for timezone tables
storage/archive/ha_archive.cc:
  Update to new handler interface
storage/archive/ha_archive.h:
  Update to new handler interface
storage/blackhole/ha_blackhole.cc:
  Update to new handler interface
storage/blackhole/ha_blackhole.h:
  Update to new handler interface
  removed not needed flag HA_DUPP_POS
storage/csv/ha_tina.cc:
  Update to new handler interface
storage/csv/ha_tina.h:
  Update to new handler interface
storage/example/ha_example.cc:
  Update to new handler interface
storage/example/ha_example.h:
  Update to new handler interface
storage/heap/hp_extra.c:
  Added heap_reset() (Required by new handler interface)
storage/heap/hp_test2.c:
  Use heap_reset()
storage/myisam/ft_boolean_search.c:
  Fixed compiler warning
storage/myisam/mi_extra.c:
  Added mi_reset() (Required by new handler interface)
storage/myisam/mi_search.c:
  Fixed DBUG_PRINT messages to use 0x%lx instead of %lx
storage/myisam/mi_test2.c:
  Use mi_reset()
storage/myisam/myisampack.c:
  Use mi_reset()
storage/myisammrg/myrg_extra.c:
  Added myrg_reset() (Required by new handler interface)
unittest/mysys/base64.t.c:
  Include my_global.h
  Don't include implictely include file 'stdlib.h'
2006-06-04 18:52:22 +03:00
unknown
88ed77f2b7 BUG#19363: mysql --no_pager makes core dump.
The problem was missing break; operator.


BitKeeper/etc/ignore:
  Added client/#mysql.cc# to the ignore list
client/mysql.cc:
  Fixed bug #19363: mysql --no_pager makes core dump. 
  There was break; missing in the case statement.
2006-06-02 22:03:39 +03:00
unknown
740077bdc5 unittest:
rename *.t* to *-t* to be automake-friendly
  simplify Makefiles
test_atomic.c:
  move to unittest, add GPL comment, fix warnings, convert to tap framework.
configure:
  remove custom tests for available types, use AC_CHECK_TYPE instead
x86-gcc.h:
  fix gcc -ansi errors while maintaining readability
ignore:
  added *-t


unittest/mysys/base64-t.c:
  Rename: unittest/mysys/base64.t.c -> unittest/mysys/base64-t.c
unittest/mysys/bitmap-t.c:
  Rename: unittest/mysys/bitmap.t.c -> unittest/mysys/bitmap-t.c
unittest/mytap/t/basic-t.c:
  Rename: unittest/mytap/t/basic.t.c -> unittest/mytap/t/basic-t.c
unittest/examples/no_plan-t.c:
  Rename: unittest/examples/no_plan.t.c -> unittest/examples/no_plan-t.c
unittest/examples/simple-t.c:
  Rename: unittest/examples/simple.t.c -> unittest/examples/simple-t.c
unittest/examples/skip-t.c:
  Rename: unittest/examples/skip.t.c -> unittest/examples/skip-t.c
unittest/examples/skip_all-t.c:
  Rename: unittest/examples/skip_all.t.c -> unittest/examples/skip_all-t.c
unittest/examples/todo-t.c:
  Rename: unittest/examples/todo.t.c -> unittest/examples/todo-t.c
BitKeeper/etc/ignore:
  added *-t
config/ac-macros/misc.m4:
  remove custom AC_TRY_RUN tests for available types, use AC_CHECK_TYPE instead
configure.in:
  remove custom tests for available types, use AC_CHECK_TYPE instead
include/atomic/x86-gcc.h:
  fix gcc -ansi errors while maintaining readability
include/my_global.h:
  remove custom tests for available types, use AC_CHECK_TYPE instead
include/my_sys.h:
  add missing declaration
mysys/Makefile.am:
  move test_atomic to unittest
unittest/Makefile.am:
  simplifications, correct permissions in chmod
unittest/README.txt:
  rename *.t* to *-t* to be automake-friendly
unittest/examples/Makefile.am:
  rename *.t* to *-t* to be automake-friendly
  simplify Makefile
unittest/mysys/Makefile.am:
  rename *.t* to *-t* to be automake-friendly
  simplify Makefile
unittest/mysys/my_atomic-t.c:
  move mysys/test_atomic.c to unittest, add GPL comment, fix warnings,
  convert to tap framework.
unittest/mytap/t/Makefile.am:
  rename *.t* to *-t* to be automake-friendly
  simplify Makefile
unittest/unit.pl:
  rename *.t* to *-t* to be automake-friendly
2006-06-01 12:25:47 +02:00
unknown
59a33015b4 Fixed Bug#19479:mysqldump creates invalid dump.
Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
This allows to use table names with ":" on non windows platforms.
On Windows platform get an error if you use table name that contains FN_DEVCHAR


include/config-win.h:
  Moved FN_DEVCHAR to config-win.h
include/my_global.h:
  Moved FN_DEVCHAR to config-win.h
mysql-test/r/create.result:
  Added testcase for Bug#19479:mysqldump creates invalid dump
BitKeeper/etc/ignore:
  Added sql/share/iso639-2.txt sql/share/fixerrmsg.pl to the ignore list
mysql-test/t/create.test:
  Added testcase for Bug#19479:mysqldump creates invalid dump
mysys/mf_fn_ext.c:
  Added checking of BASKSLASH_MBTAIL as dirname_part depends on it.
  Fixed cast and indentation.
sql/table.cc:
  Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
  This allows to use table names with ":" on non windows platforms.
  On Windows platform get an error if you use table name that contains FN_DEVCHAR
2006-06-01 12:34:44 +03:00
unknown
8b45817780 WL#2595 - atomic operations
BitKeeper/etc/ignore:
  Added mysys/test_atomic to the ignore list
2006-05-31 18:44:09 +02:00
unknown
19be345d0c Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-maria


BitKeeper/etc/ignore:
  auto-union
include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
BUILD/SETUP.sh:
  merge
configure.in:
  merge
libmysqld/Makefile.am:
  merge
sql/handler.h:
  merge
sql/set_var.cc:
  merge
storage/Makefile.am:
  merge
storage/myisam/myisamdef.h:
  merge
2006-05-24 08:16:53 +03:00
unknown
f4781a7e4c fix for bug #17619 Scheduler race conditions
- Scheduler is either initialized at server start or never.
  Starting & stopping is now suspending & resuming.
- The scheduler has clear OO interface
- Now all calls to the scheduler are synchronous
- GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
- External API is encapsulated into class Events
- Includes fixes for all comments of Kostja's review of 19.05.2005

Starting to merge into 5.1-release (5.1.10) and push


BitKeeper/etc/ignore:
  Added libmysqld/event_scheduler.cc to the ignore list
libmysqld/Makefile.am:
  executor -> scheduler
mysql-test/r/events.result:
  update result
mysql-test/r/events_bugs.result:
  update result
mysql-test/r/events_logs_tests.result:
  update result
mysql-test/r/events_microsec.result:
  update result
mysql-test/r/events_scheduling.result:
  update result
mysql-test/r/events_stress.result:
  update result
mysql-test/t/disabled.def:
  enable these tests
mysql-test/t/events.test:
  optimize the test a bit for speed, save some seconds runtime
  remove FULL from SHOW EVENTS
  mostly use I_S.EVENTS
mysql-test/t/events_bugs.test:
  Skip irrelevant for the current design tests - all events are loaded
  on server startup. Change in mysql.event will be visible on next server start.
  Don't use numeric error codes.
mysql-test/t/events_logs_tests.test:
  optimize the test a bit for speed
mysql-test/t/events_microsec.test:
   Skip irrelevant for the current design tests - all events are loaded
      on server startup. Change in mysql.event will be visible on next server start.
      Don't use numeric error codes.
mysql-test/t/events_scheduling.test:
  broader test
mysql-test/t/events_stress.test:
  Rework the test to the new architecture of suspending/resuming.
  Use less events, no need for thousands, hundreds is still ok.
sql/Makefile.am:
  executor -> scheduler
sql/cmakelists.txt:
  executor -> scheduler
sql/event.cc:
  - remove todo comments
  - remove unneded evex_queue abstraction functions
  - move events_init() and events_shutdown() from event_executor.cc to here
  - export db_create_event
  - remove evex_load_and_compile_event, part of class Event_scheduler
  - integrate the public interface found in event.h and used by sql_parse.cc
    to use the new class Event_scheduler.
sql/event.h:
  - add COND_finished so if one thread kills a running event it waits on this
  - export callback event_timed_definer_equal, event_timed_identifier_equal(),
    event_timed_name_equal and event_timed_db_equal()
    to be used by Event_scheduler::drop_matching_events()
  - cleanup event.h
  - encapsulated all external interface into class Events
sql/event_executor.cc:
  make it empty, will delete after that
sql/event_priv.h:
  - more things in the private header
  - remove event queue abstraction functions. tightly bind to QUEUE
  - export privately db_drop_event, db_find_event, db_create_event()
  - made change_security_context() and restore_security_context() free functions
sql/event_timed.cc:
  - fix calculation of time when ENDS is set (STARTS is always set)
  - during Event_timed::compile() set the right Security_ctx. Prevents a crash
        during Event_scheduler::load_events_from_db()
  - add Event_timed::kill_thread()
  - implement event_timed_*_equal()
  - made change_security_context() and restore_security_context() free functions.
  - Comments cleanups
sql/lex.h:
  new word scheduler for SHOW SCHEDULER STATUS (available only debug builds)
sql/log.cc:
  move these from event_scheduler.cc
sql/mysql_priv.h:
  refactor kill_one_thread
  export sql_print_message_func and sql_print_message_handlers
sql/mysqld.cc:
  In close_connections, called by kill_server() skip the main scheduler
  thread and use events_shutdown() for shutting down the scheduler, in the same
  manner it's done for RPL.
  Add a new value to --event-scheduler :
  0 <- No scheduler available
  1 <- Start with scheduler enabled
  2 <- Start with scheduler suspended
sql/repl_failsafe.cc:
  refactor thd::system_thread to be an enum
sql/set_var.cc:
  move sys_var_event_executor::update() to set_var.cc
  executor -> scheduler
  use thd::sys_var_tmp
sql/set_var.h:
  executor -> scheduler
sql/share/errmsg.txt:
  3 new error messages
sql/sql_class.cc:
  refactor thd::system_thread to be an enum . more type-safety
sql/sql_class.h:
  refactor thd::system_thread to be an enum . more type-safety
sql/sql_db.cc:
  get the error from evex_drop_schema_events
sql/sql_error.h:
  export warning_level_names
sql/sql_lex.h:
  new command SHOW SCHEDULER STATUS, available only in debug build and
  for debug purposes.
sql/sql_parse.cc:
  refactor kill_one_thread() -> does the *dirty* work, and sql_kill
  just the reporting.
  add handler for SQLCOM_SHOW_SCHEDULER_STATUS
sql/sql_show.cc:
  fix verbosity handling (this will be obsoleted anyway by the fix for 17394).
sql/sql_yacc.yy:
  remove FULL from SHOW EVENTS
  add SHOW SCHEDULER STATUS in debug builds
sql/table.cc:
  Fix valgrind warning.
2006-05-22 20:46:13 +02:00
unknown
b0efe477fb Merge xiphis.org:/home/antony/work2/mysql-5.1
into  xiphis.org:/home/antony/work2/wl3201-post-review.2


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
2006-05-01 22:45:31 -07:00
unknown
57b21b5bdb Fix for Win build
BitKeeper/etc/ignore:
  Added client/mysql_upgrade to the ignore list
client/mysql_upgrade.c:
  fixed for Win build
include/config-win.h:
  fixed for Win build
2006-05-01 22:16:08 +05:00
unknown
c3c5f8d6d7 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
  Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
  Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
  Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysql.sln:
  Auto merged
VC++Files/mysql_ia64.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
config/ac-macros/zlib.m4:
  Auto merged
configure.in:
  Auto merged
extra/yassl/Makefile.am:
  Auto merged
extra/yassl/taocrypt/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/libmysqld.def:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/Makefile.am:
  Resolve conflict
config/ac-macros/yassl.m4:
  Resolve conflict
mysql-test/include/have_udf.inc:
  Resolve conflict
mysql-test/lib/mtr_process.pl:
  Resolve conflict
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/r/have_udf.require:
  Resolve conflict
mysql-test/r/rpl_openssl.result:
  Resolve conflict
mysql-test/t/disabled.def:
  Resolve conflict
mysql-test/t/information_schema.test:
  Resolve conflict
server-tools/instance-manager/instance_options.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
support-files/mysql.spec.sh:
  Resolve conflict
2006-04-30 13:27:38 -07:00
unknown
3d35b05a0c fixes
Makefile.am:
  plugin/ must be built before sql/
config/ac-macros/plugins.m4:
  simplifications, style fixes
BitKeeper/etc/ignore:
  Added compile libmysqld/sql_builtin.cc sql/sql_builtin.cc to the ignore list
plugin/Makefile.am:
  restore comment
plugin/fulltext/Makefile.am:
  revert
sql/sql_show.cc:
  revert
2006-04-30 15:52:30 -04:00
unknown
f3e00e9f09 Cleanup formatting
BitKeeper/etc/ignore:
  Added extra/yassl/taocrypt/benchmark/benchmark extra/yassl/taocrypt/test/test extra/yassl/testsuite/testsuite to the ignore list
2006-04-24 10:39:56 +02:00
unknown
d23064a668 Fix 'make distcheck' problems with new unittest code, and a small
portability problem.


BitKeeper/etc/ignore:
  Use a wildcard to ignore all unittest *.t files
unittest/Makefile.am:
  Add unit to DISTCLEANFILES, and make sure to copy it from srcdir
unittest/examples/Makefile.am:
  Use srcdir to find mytap header
unittest/mysys/Makefile.am:
  Use srcdir to find mytap header
unittest/mytap/t/Makefile.am:
  Use builddir for finding mytap library
unittest/mytap/tap.c:
  Fix portability problem (declarations after code in C code)
2006-04-13 13:01:57 -07:00
unknown
a56e488ac0 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).


BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Delete: mysql-test/init_db.sql
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Delete: mysql-test/my_create_tables.c
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Delete: mysql-test/my_manage.c
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Delete: mysql-test/my_manage.h
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Delete: mysql-test/mysql_test_run_new.c
mysql-test/mysql-test-run.sh:
  Remove code that uses old mysqltestmanager
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Delete: tools/Makefile.am
BitKeeper/deleted/.del-managertest1.nc~96a5c1c5c2d33085:
  Delete: tools/managertest1.nc
BitKeeper/deleted/.del-mysqlmanager-sample.pwd~712b89f01aaad84a:
  Delete: tools/mysqlmanager-sample.pwd
BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
  Delete: tools/mysqlmanager.c
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Delete: SSL/client-req.pem
BitKeeper/deleted/.del-run-client~e683192d4f3821e0:
  Delete: SSL/run-client
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Delete: SSL/server-req.pem
BitKeeper/deleted/.del-run-server~55426778bc206c48:
  Delete: SSL/run-server
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Delete: SSL/Makefile.am
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Delete: SSL/NOTES
BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9:
  Delete: client/mysqlmanager-pwgen.c
BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
  Delete: client/mysqlmanagerc.c
BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Delete: Docs/Books/algor.eps
BitKeeper/deleted/.del-bk.txt~ffd510fa9531f87c:
  Delete: Docs/bk.txt
BitKeeper/deleted/.del-algor.gif~72c40c3bad198f2f:
  Delete: Docs/Books/algor.gif
BitKeeper/deleted/.del-algor.txt~37d2b5c1290e3cfa:
  Delete: Docs/Books/algor.txt
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Delete: Docs/Books/dbi.eps
BitKeeper/deleted/.del-dbi.gif~8f6861147437298b:
  Delete: Docs/Books/dbi.gif
BitKeeper/deleted/.del-dbi.txt~f5cf3fe321168fd5:
  Delete: Docs/Books/dbi.txt
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Delete: Docs/Books/dubois.eps
BitKeeper/deleted/.del-dubois.gif~e02d361b13b1c4a4:
  Delete: Docs/Books/dubois.gif
BitKeeper/deleted/.del-dubois.txt~998581cf9040fcc:
  Delete: Docs/Books/dubois.txt
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Delete: Docs/Books/ecomm.eps
BitKeeper/deleted/.del-ecomm.gif~f9bce6949b171613:
  Delete: Docs/Books/ecomm.gif
BitKeeper/deleted/.del-ecomm.txt~27494674104ee9db:
  Delete: Docs/Books/ecomm.txt
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Delete: Docs/Books/in_21.eps
BitKeeper/deleted/.del-in_21.gif~4a0b14f6d76458a9:
  Delete: Docs/Books/in_21.gif
BitKeeper/deleted/.del-in_21.txt~448fb4b3d8c0b34e:
  Delete: Docs/Books/in_21.txt
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Delete: Docs/Books/manual.eps
BitKeeper/deleted/.del-manual.gif~657cf08119b1b3fc:
  Delete: Docs/Books/manual.gif
BitKeeper/deleted/.del-manual.txt~4702af61ea5e3c29:
  Delete: Docs/Books/manual.txt
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Delete: Docs/Books/msql.eps
BitKeeper/deleted/.del-msql.gif~72ea7c6d307b9108:
  Delete: Docs/Books/msql.gif
BitKeeper/deleted/.del-msql.txt~235ae568824f4073:
  Delete: Docs/Books/msql.txt
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Delete: Docs/Books/prof.eps
BitKeeper/deleted/.del-prof.gif~2fa8ed201d9d05fe:
  Delete: Docs/Books/prof.gif
BitKeeper/deleted/.del-prof.txt~9fc04ec3e5ce8361:
  Delete: Docs/Books/prof.txt
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Delete: Docs/Books/pthreads.eps
BitKeeper/deleted/.del-pthreads.gif~2d9460dec2577859:
  Delete: Docs/Books/pthreads.gif
BitKeeper/deleted/.del-pthreads.txt~fc9e17d021335a39:
  Delete: Docs/Books/pthreads.txt
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Delete: Docs/Books/realmen.eps
BitKeeper/deleted/.del-realmen.gif~86113e3b1fcbd597:
  Delete: Docs/Books/realmen.gif
BitKeeper/deleted/.del-realmen.txt~81c30565a8f06539:
  Delete: Docs/Books/realmen.txt
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Delete: Docs/Books/sql-99.eps
BitKeeper/deleted/.del-sql-99.gif~df369376884a5689:
  Delete: Docs/Books/sql-99.gif
BitKeeper/deleted/.del-sql-99.txt~eff316adac3dd5b8:
  Delete: Docs/Books/sql-99.txt
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt~6e5b88fe4217504d:
  Delete: Docs/Tutorial-MySQL-final.txt
BitKeeper/deleted/.del-mysql-01.gif~6f3f2e474b834ac6:
  Delete: Docs/MySQL-logos/mysql-01.gif
BitKeeper/deleted/.del-mysql-02.gif~5e03e2ffa6bd060f:
  Delete: Docs/MySQL-logos/mysql-02.gif
BitKeeper/deleted/.del-mysql-03.gif~a510e3599346cd5f:
  Delete: Docs/MySQL-logos/mysql-03.gif
BitKeeper/deleted/.del-mysql-04.gif~6c3fdc91da64574:
  Delete: Docs/MySQL-logos/mysql-04.gif
BitKeeper/deleted/.del-mysql-05.gif~230c28315136655:
  Delete: Docs/MySQL-logos/mysql-05.gif
BitKeeper/deleted/.del-mysql-06.gif~8bb16461fd45634e:
  Delete: Docs/MySQL-logos/mysql-06.gif
BitKeeper/deleted/.del-mysql-07.gif~b86f918998a2114e:
  Delete: Docs/MySQL-logos/mysql-07.gif
BitKeeper/deleted/.del-mysql-08.gif~50fb4d886f82e8bc:
  Delete: Docs/MySQL-logos/mysql-08.gif
BitKeeper/deleted/.del-mysql-09.gif~17604ce9d92cd94a:
  Delete: Docs/MySQL-logos/mysql-09.gif
BitKeeper/deleted/.del-mysql-10.gif~a8b5306c4d911f8e:
  Delete: Docs/MySQL-logos/mysql-10.gif
BitKeeper/deleted/.del-mysql-11.gif~8495404458978524:
  Delete: Docs/MySQL-logos/mysql-11.gif
BitKeeper/deleted/.del-mysql-12.gif~18d47c1ad5aef481:
  Delete: Docs/MySQL-logos/mysql-12.gif
BitKeeper/deleted/.del-mysql-13.gif~1ad2eedf58da3aaa:
  Delete: Docs/MySQL-logos/mysql-13.gif
BitKeeper/deleted/.del-mysql-14.gif~a11e7df8653ad1b1:
  Delete: Docs/MySQL-logos/mysql-14.gif
BitKeeper/deleted/.del-mysql-15.gif~64c998fdd6fc1ae1:
  Delete: Docs/MySQL-logos/mysql-15.gif
BitKeeper/deleted/.del-mysql-16.gif~6a6c86de2f85f0f5:
  Delete: Docs/MySQL-logos/mysql-16.gif
BitKeeper/deleted/.del-mysql-17.gif~b07962578d0952b1:
  Delete: Docs/MySQL-logos/mysql-17.gif
BitKeeper/deleted/.del-mysql_anim-01.gif~d27d4f0c1a2a6da9:
  Delete: Docs/MySQL-logos/mysql_anim-01.gif
BitKeeper/deleted/.del-mysql_anim-02.gif~476224d724007343:
  Delete: Docs/MySQL-logos/mysql_anim-02.gif
BitKeeper/deleted/.del-mysql_anim-03.gif~470dd9c9a8bd55fc:
  Delete: Docs/MySQL-logos/mysql_anim-03.gif
BitKeeper/deleted/.del-mysql_anim-04.gif~14f429c87c0c718:
  Delete: Docs/MySQL-logos/mysql_anim-04.gif
BitKeeper/deleted/.del-mysql_anim-05.gif~e63e7f003b77ad95:
  Delete: Docs/MySQL-logos/mysql_anim-05.gif
BitKeeper/deleted/.del-mysql_anim-06.gif~d9cffaf35d9d4719:
  Delete: Docs/MySQL-logos/mysql_anim-06.gif
BitKeeper/deleted/.del-mysql-compatible.jpg~56ecc684688a7382:
  Delete: Docs/MySQL-logos/mysql-compatible.jpg
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
  Delete: Docs/Support/docbook-fixup.pl
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
  Delete: Docs/Support/docbook-prefix.pl
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
  Delete: Docs/Support/docbook-split
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
  Delete: Docs/Support/make-docbook
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
  Delete: Docs/Support/make-makefile
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
  Delete: Docs/Support/test-make-manual
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
  Delete: Docs/Support/test-make-manual-de
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch~40d336454ecf98db:
  Delete: Docs/Support/trivial-makeinfo-4.0c.patch
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
  Delete: Docs/Support/xwf
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
  Delete: Docs/Support/colspec-fix.pl
Docs/generate-text-files.pl:
  Rename: Docs/Support/generate-text-files.pl -> Docs/generate-text-files.pl
BitKeeper/deleted/.del-.cvsignore~250f630140b90042:
  Delete: Docs/Support/.cvsignore
BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Delete: Docs/changelog-4.0.xml
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Delete: Docs/changelog-4.1.xml
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Delete: Docs/changelog-5.0.xml
BitKeeper/deleted/.del-sp-implemented.txt~15f5c0033d848288:
  Delete: Docs/sp-implemented.txt
mysql-test/std_data/cacert.pem:
  Rename: SSL/cacert.pem -> mysql-test/std_data/cacert.pem
mysql-test/std_data/client-cert.pem:
  Rename: SSL/client-cert.pem -> mysql-test/std_data/client-cert.pem
mysql-test/std_data/client-key.pem:
  Rename: SSL/client-key.pem -> mysql-test/std_data/client-key.pem
mysql-test/std_data/server-cert.pem:
  Rename: SSL/server-cert.pem -> mysql-test/std_data/server-cert.pem
mysql-test/std_data/server-key.pem:
  Rename: SSL/server-key.pem -> mysql-test/std_data/server-key.pem
BitKeeper/etc/ignore:
  added client/mysql_upgrade
Docs/Makefile.am:
  Move generate-text-files.pl up a level, since it is the only Support file
Makefile.am:
  Remove tools and SSL directories
client/Makefile.am:
  Remove mysqltestmanager clients
configure.in:
  Remove old tools directory
mysql-test/Makefile.am:
  Don't need to copy .pem files any more, they're now in std_data.
scripts/make_binary_distribution.sh:
  Don't package up mysqltestmanager
support-files/mysql.spec.sh:
  Don't package mysqltestmanager
2006-04-11 18:54:24 -07:00
unknown
d2b8d744d9 Added storage/maria (based on MyISAM). WL#3245
Moved things into ft_global.h, my_handler.h and myisamchk.h to allow MyISAM and Maria to share code and defines
Rename of not properly renamed functions in MyISAM and my_handler.c
Renamed some MI_ defines to HA_ to allow MyISAM and Maria to share
Added maria variables to mysqld.cc and set_var.cc
Fixed compiler warnings



BitKeeper/etc/ignore:
  added storage/maria/*.MAI
BUILD/SETUP.sh:
  Compile maria by default
BitKeeper/triggers/post-commit:
  No public maria emails.
  Mark changesets emails with 'maria'
configure.in:
  Add maria
include/ft_global.h:
  Move defines needed by maria and MyISAM here
include/keycache.h:
  Add support for default key_cache if cache not found
include/my_base.h:
  Add invalidator_by_filename
include/my_handler.h:
  Remove duplicate header files
  Add defines that are typical for handlers (MyISAM and Maria)
include/myisam.h:
  Move things to my_handler.h to allow Maria and MyISAM to share things
  (Some things needed to be shared to allow sharing of HA_CHECK structure)
libmysqld/Makefile.am:
  Added ha_maria.cc
mysys/mf_keycaches.c:
  Added default value for multi_key_cache_search
mysys/my_handler.c:
  mi_compare_text -> ha_compare_text
  Removed compiler warnings
sql/ha_myisam.cc:
  MI_CHECK -> HA_CHECK
  MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
sql/ha_myisam.h:
  MI_CHECK -> HA_CHECK
  MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
sql/ha_myisammrg.h:
  MI_CHECK -> HA_CHECK
  MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
sql/handler.h:
  Added MARIA
  Added inclusion of my_handler.h
sql/item_func.h:
  Remove duplicate include
sql/mysql_priv.h:
  Added maria variables
sql/mysqld.cc:
  Added maria
sql/set_var.cc:
  Added maria status variables
sql/set_var.h:
  Added maria
sql/sql_class.h:
  Added maria status variables
sql/sql_sort.h:
  Remove duplicate BUFFPEK struct
storage/Makefile.am:
  Added maria
storage/csv/ha_tina.cc:
  Removed compiler warning
storage/myisam/Makefile.am:
  Added ft_myisam.c
storage/myisam/ft_boolean_search.c:
  mi_compare_text -> ha_compare_text
  MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
  Remove compiler warnings
storage/myisam/ft_nlq_search.c:
  mi_compare_text -> ha_compare_text
storage/myisam/ft_parser.c:
  mi_compare_text -> ha_compare_text
storage/myisam/ft_static.c:
  Move ft_init_search() to ft_myisam.c to make ft_static.c independent of MyISAM
storage/myisam/ft_stopwords.c:
  mi_compare_text -> ha_compare_text
storage/myisam/ft_update.c:
  mi_compare_text -> ha_compare_text
storage/myisam/fulltext.h:
  Move things to ft_global.h to allow to share more things between MyISAM and Maria
storage/myisam/mi_check.c:
  MI_CHECK -> HA_CHECK
storage/myisam/mi_create.c:
  MI_MAX_POSSIBLE_KEY ->   HA_MAX_POSSIBLE_KEY
  MI_MAX_KEY_BLOCK_SIZE -> HA_MAX_KEY_BLOCK_SIZE
  MI_MAX_KEY_SEG ->  HA_MAX_KEY_SEG
  MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
storage/myisam/mi_delete.c:
  MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
storage/myisam/mi_delete_all.c:
  Remove not used variable
storage/myisam/mi_dynrec.c:
  _my_calc_total_blob_length -> _mi_calc_total_blob_length
storage/myisam/mi_key.c:
  _my_store_blob_length -> _mi_store_blob_length
storage/myisam/mi_log.c:
  _my_calc_total_blob_length -> _mi_calc_total_blob_length
storage/myisam/mi_open.c:
  MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY
  MI_MAX_KEY_SEG ->      HA_MAX_KEY_SEG
  MI_MAX_KEY_BUFF ->     HA_MAX_KEY_BUFF
  my_n_base_info_read -> mi_n_base_info_read
storage/myisam/mi_packrec.c:
  Made read_pack_length static
  _my_store_blob_length -> _mi_store_blob_length
  Remove not used variable
storage/myisam/mi_range.c:
  MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
storage/myisam/mi_search.c:
  MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
storage/myisam/mi_test1.c:
  MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
storage/myisam/mi_test2.c:
  Fixed compiler warning
storage/myisam/mi_unique.c:
  Fixed compiler warning
  mi_compare_text -> ha_compare_text
storage/myisam/mi_update.c:
  MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
storage/myisam/mi_write.c:
  Rename of defines and functions
storage/myisam/myisamchk.c:
  Rename of defines and functions
storage/myisam/myisamdef.h:
  Remove tabs
  Indentation fixes (Large changes as I did run indent-ex on the file)
  Move some things to myisamchk.h
  Added missing functions that gave compiler warnings
storage/myisam/myisamlog.c:
  Rename of defines and functions
storage/myisam/myisampack.c:
  Remove compiler warning
storage/myisam/rt_index.c:
  Rename of defines and functions
storage/myisam/sort.c:
  Rename of defines, functions and structures
config/ac-macros/ha_maria.m4:
  New BitKeeper file ``config/ac-macros/ha_maria.m4''
include/maria.h:
  New BitKeeper file ``include/maria.h''
include/myisamchk.h:
  New BitKeeper file ``include/myisamchk.h''
libmysqld/ha_maria.cc:
  New BitKeeper file ``libmysqld/ha_maria.cc''
mysql-test/include/have_maria.inc:
  New BitKeeper file ``mysql-test/include/have_maria.inc''
mysql-test/r/have_maria.require:
  New BitKeeper file ``mysql-test/r/have_maria.require''
mysql-test/r/maria.result:
  New BitKeeper file ``mysql-test/r/maria.result''
mysql-test/r/ps_maria.result:
  New BitKeeper file ``mysql-test/r/ps_maria.result''
mysql-test/t/maria.test:
  New BitKeeper file ``mysql-test/t/maria.test''
mysql-test/t/ps_maria.test:
  New BitKeeper file ``mysql-test/t/ps_maria.test''
sql/ha_maria.cc:
  New BitKeeper file ``sql/ha_maria.cc''
sql/ha_maria.h:
  New BitKeeper file ``sql/ha_maria.h''
storage/maria/Makefile.am:
  New BitKeeper file ``storage/maria/Makefile.am''
storage/maria/cmakelists.txt:
  New BitKeeper file ``storage/maria/cmakelists.txt''
storage/maria/ft_maria.c:
  New BitKeeper file ``storage/maria/ft_maria.c''
storage/maria/ma_cache.c:
  New BitKeeper file ``storage/maria/ma_cache.c''
storage/maria/ma_changed.c:
  New BitKeeper file ``storage/maria/ma_changed.c''
storage/maria/ma_check.c:
  New BitKeeper file ``storage/maria/ma_check.c''
storage/maria/ma_checksum.c:
  New BitKeeper file ``storage/maria/ma_checksum.c''
storage/maria/ma_close.c:
  New BitKeeper file ``storage/maria/ma_close.c''
storage/maria/ma_create.c:
  New BitKeeper file ``storage/maria/ma_create.c''
storage/maria/ma_dbug.c:
  New BitKeeper file ``storage/maria/ma_dbug.c''
storage/maria/ma_delete.c:
  New BitKeeper file ``storage/maria/ma_delete.c''
storage/maria/ma_delete_all.c:
  New BitKeeper file ``storage/maria/ma_delete_all.c''
storage/maria/ma_delete_table.c:
  New BitKeeper file ``storage/maria/ma_delete_table.c''
storage/maria/ma_dynrec.c:
  New BitKeeper file ``storage/maria/ma_dynrec.c''
storage/maria/ma_extra.c:
  New BitKeeper file ``storage/maria/ma_extra.c''
storage/maria/ma_ft_boolean_search.c:
  New BitKeeper file ``storage/maria/ma_ft_boolean_search.c''
storage/maria/ma_ft_eval.c:
  New BitKeeper file ``storage/maria/ma_ft_eval.c''
storage/maria/ma_ft_eval.h:
  New BitKeeper file ``storage/maria/ma_ft_eval.h''
storage/maria/ma_ft_nlq_search.c:
  New BitKeeper file ``storage/maria/ma_ft_nlq_search.c''
storage/maria/ma_ft_parser.c:
  New BitKeeper file ``storage/maria/ma_ft_parser.c''
storage/maria/ma_ft_stem.c:
  New BitKeeper file ``storage/maria/ma_ft_stem.c''
storage/maria/ma_ft_test1.c:
  New BitKeeper file ``storage/maria/ma_ft_test1.c''
storage/maria/ma_ft_test1.h:
  New BitKeeper file ``storage/maria/ma_ft_test1.h''
storage/maria/ma_ft_update.c:
  New BitKeeper file ``storage/maria/ma_ft_update.c''
storage/maria/ma_ftdefs.h:
  New BitKeeper file ``storage/maria/ma_ftdefs.h''
storage/maria/ma_fulltext.h:
  New BitKeeper file ``storage/maria/ma_fulltext.h''
storage/maria/ma_info.c:
  New BitKeeper file ``storage/maria/ma_info.c''
storage/maria/ma_init.c:
  New BitKeeper file ``storage/maria/ma_init.c''
storage/maria/ma_key.c:
  New BitKeeper file ``storage/maria/ma_key.c''
storage/maria/ma_keycache.c:
  New BitKeeper file ``storage/maria/ma_keycache.c''
storage/maria/ma_locking.c:
  New BitKeeper file ``storage/maria/ma_locking.c''
storage/maria/ma_log.c:
  New BitKeeper file ``storage/maria/ma_log.c''
storage/maria/ma_open.c:
  New BitKeeper file ``storage/maria/ma_open.c''
storage/maria/ma_packrec.c:
  New BitKeeper file ``storage/maria/ma_packrec.c''
storage/maria/ma_page.c:
  New BitKeeper file ``storage/maria/ma_page.c''
storage/maria/ma_panic.c:
  New BitKeeper file ``storage/maria/ma_panic.c''
storage/maria/ma_preload.c:
  New BitKeeper file ``storage/maria/ma_preload.c''
storage/maria/ma_range.c:
  New BitKeeper file ``storage/maria/ma_range.c''
storage/maria/ma_rename.c:
  New BitKeeper file ``storage/maria/ma_rename.c''
storage/maria/ma_rfirst.c:
  New BitKeeper file ``storage/maria/ma_rfirst.c''
storage/maria/ma_rkey.c:
  New BitKeeper file ``storage/maria/ma_rkey.c''
storage/maria/ma_rlast.c:
  New BitKeeper file ``storage/maria/ma_rlast.c''
storage/maria/ma_rnext.c:
  New BitKeeper file ``storage/maria/ma_rnext.c''
storage/maria/ma_rnext_same.c:
  New BitKeeper file ``storage/maria/ma_rnext_same.c''
storage/maria/ma_rprev.c:
  New BitKeeper file ``storage/maria/ma_rprev.c''
storage/maria/ma_rrnd.c:
  New BitKeeper file ``storage/maria/ma_rrnd.c''
storage/maria/ma_rsame.c:
  New BitKeeper file ``storage/maria/ma_rsame.c''
storage/maria/ma_rsamepos.c:
  New BitKeeper file ``storage/maria/ma_rsamepos.c''
storage/maria/ma_rt_index.c:
  New BitKeeper file ``storage/maria/ma_rt_index.c''
storage/maria/ma_rt_index.h:
  New BitKeeper file ``storage/maria/ma_rt_index.h''
storage/maria/ma_rt_key.c:
  New BitKeeper file ``storage/maria/ma_rt_key.c''
storage/maria/ma_rt_key.h:
  New BitKeeper file ``storage/maria/ma_rt_key.h''
storage/maria/ma_rt_mbr.c:
  New BitKeeper file ``storage/maria/ma_rt_mbr.c''
storage/maria/ma_rt_mbr.h:
  New BitKeeper file ``storage/maria/ma_rt_mbr.h''
storage/maria/ma_rt_split.c:
  New BitKeeper file ``storage/maria/ma_rt_split.c''
storage/maria/ma_rt_test.c:
  New BitKeeper file ``storage/maria/ma_rt_test.c''
storage/maria/ma_scan.c:
  New BitKeeper file ``storage/maria/ma_scan.c''
storage/maria/ma_search.c:
  New BitKeeper file ``storage/maria/ma_search.c''
storage/maria/ma_sort.c:
  New BitKeeper file ``storage/maria/ma_sort.c''
storage/maria/ma_sp_defs.h:
  New BitKeeper file ``storage/maria/ma_sp_defs.h''
storage/maria/ma_sp_key.c:
  New BitKeeper file ``storage/maria/ma_sp_key.c''
storage/maria/ma_sp_test.c:
  New BitKeeper file ``storage/maria/ma_sp_test.c''
storage/maria/ma_static.c:
  New BitKeeper file ``storage/maria/ma_static.c''
storage/maria/ma_statrec.c:
  New BitKeeper file ``storage/maria/ma_statrec.c''
storage/maria/ma_test1.c:
  New BitKeeper file ``storage/maria/ma_test1.c''
storage/maria/ma_test2.c:
  New BitKeeper file ``storage/maria/ma_test2.c''
storage/maria/ma_test3.c:
  New BitKeeper file ``storage/maria/ma_test3.c''
storage/maria/ma_test_all.sh:
  New BitKeeper file ``storage/maria/ma_test_all.sh''
storage/maria/ma_unique.c:
  New BitKeeper file ``storage/maria/ma_unique.c''
storage/maria/ma_update.c:
  New BitKeeper file ``storage/maria/ma_update.c''
storage/maria/ma_write.c:
  New BitKeeper file ``storage/maria/ma_write.c''
storage/maria/maria_chk.c:
  New BitKeeper file ``storage/maria/maria_chk.c''
storage/maria/maria_def.h:
  New BitKeeper file ``storage/maria/maria_def.h''
storage/maria/maria_ftdump.c:
  New BitKeeper file ``storage/maria/maria_ftdump.c''
storage/maria/maria_log.c:
  New BitKeeper file ``storage/maria/maria_log.c''
storage/maria/maria_pack.c:
  New BitKeeper file ``storage/maria/maria_pack.c''
storage/maria/maria_rename.sh:
  New BitKeeper file ``storage/maria/maria_rename.sh''
storage/maria/test_pack:
  New BitKeeper file ``storage/maria/test_pack''
storage/myisam/ft_myisam.c:
  New BitKeeper file ``storage/myisam/ft_myisam.c''
2006-04-11 16:45:10 +03:00
unknown
59eaf292de Fixed compiler and valgrind warnings
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.

Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests


BitKeeper/etc/ignore:
  added mysql-test/r/*.log
client/mysqltest.c:
  Change type of variables to get rid of compiler warnings
  More debugging
  Fix memory leak
mysql-test/mysql-test-run.sh:
  Collect warnings about missing DBUG_RETURN statements
mysql-test/r/lock_multi.result:
  Add test of new code
mysql-test/r/ndb_condition_pushdown.result:
  Drop used tables before test
mysql-test/t/lock_multi.test:
  Add test of new code
mysql-test/t/ndb_condition_pushdown.test:
  Drop used tables before test
mysql-test/valgrind.supp:
  Ignore 'safe' warnings from libz (when used with archive)
sql/event.cc:
  More comments
  Simplify code
  Fixed memory leak found by valgrind
sql/ha_archive.cc:
  Remove compiler warnings (Wrong handlerton structure and signed/unsigned comparison)
sql/ha_berkeley.cc:
  Fixed compiler warning
sql/ha_blackhole.cc:
  Fixed compiler warning
sql/ha_federated.cc:
  Fixed compiler warning
sql/ha_heap.cc:
  Fixed compiler warning
sql/ha_myisam.cc:
  Fixed compiler warning
sql/ha_myisammrg.cc:
  Fixed compiler warning
sql/ha_ndbcluster.cc:
  Fixed compiler warnings
sql/ha_partition.cc:
  Fixed compiler warning
  Fixed error noticed by valgrind in ha_partition::rnd_init()
sql/handler.cc:
  Fixed compiler warning
sql/handler.h:
  Fixed compiler warning
sql/item.cc:
  Fixed compiler warning
sql/item_xmlfunc.cc:
  Fixed warning from valgrind when calling memcpy with wrong address
sql/lock.cc:
  More debugging
sql/log.cc:
  Fixed compiler warning
  Indentation fixes
sql/log.h:
  Fixed compiler warning
sql/mysql_priv.h:
  Changed prototype for 'drop_locked_tables'
sql/opt_range.cc:
  Indentation fix
sql/password.c:
  Removed compiler warnings
sql/set_var.cc:
  Fixed compiler warning
sql/slave.cc:
  Fixed compiler warning
sql/sp_head.cc:
  Fixed compiler warning
sql/sql_acl.cc:
  Fixed compiler warning
sql/sql_analyse.cc:
  Added missing DBUG_RETURN statements
sql/sql_base.cc:
  Removed de-reference of not initialized pointer
  More comments
  drop_locked_tables() changed to not delete tables used for name locking
  Fixed compiler warnings
sql/sql_delete.cc:
  Fixed usage of not initialized variable
  (deleted could be referenced in some not common error conditions)
sql/sql_parse.cc:
  Added missing DBUG_VOID_RETURN
  Simplify code
sql/sql_partition.cc:
  Fixed usage of wrong variable (noticed by valgrind)
sql/sql_plugin.cc:
  Removed compiler warning
sql/sql_show.cc:
  Removed compiler warning
sql/sql_table.cc:
  Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
  This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
  This will allow Tomas to continue with his work to use namelocks to syncronize things.
  
  Fixed wrong test of 'table_type' (path_length could otherwise be accessed uninitialized)
  
  Remove compile warnings about not initialized variables.
sql/sql_yacc.yy:
  Ensure that no_write_to_binlog is properly initialized
  (Was accessed uninitialized by partition code)
sql/table.cc:
  Removed valgrind warnings (not fatal)
  Removed compiler warnings
sql/tztime.cc:
  Removed valgrind warning
storage/ndb/include/ndbapi/NdbIndexStat.hpp:
  Removed compiler warning
2006-03-29 14:27:36 +03:00
unknown
effd72a9ea Merge zim.(none):/home/ian/workspace/mysql-5.0
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian


BitKeeper/etc/ignore:
  auto-union
include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Changing message to add in bug numnber
2006-03-27 19:48:44 -08:00
unknown
63605b9fd4 Disable udf test
BitKeeper/etc/ignore:
  Added mysql-test/r/udf.log to the ignore list
mysql-test/t/disabled.def:
  Disable the udf test, per bug #18564. Permission by Brian
2006-03-27 18:25:35 -08:00
unknown
af64d85ab9 Fix for bug #16855
BitKeeper/etc/ignore:
  Added mysql-test/r/bdb.log mysql-test/r/im_client_port.log to the ignore list
client/mysql.cc:
  If --socket is not set, provides --protocol=TCP when --port=
  is specified (and --protocol= is not specified.)
2006-03-27 17:45:06 -08:00
unknown
b98431a0ab update
BitKeeper/etc/ignore:
  Added mysql-test/r/backup.log mysql-test/r/events.log mysql-test/r/events_bugs.log mysql-test/r/events_logs_tests.log mysql-test/r/mysqltest.log mysql-test/r/symlink.log mysql-test/r/system_mysql_db.log to the ignore list
2006-03-25 13:14:52 +01:00
unknown
570f328174 merged
BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-03-06 23:20:19 +01:00
unknown
502b307358 compilation fixes
BitKeeper/etc/ignore:
  Added include/openssl to the ignore list
2006-03-06 22:08:29 +01:00
unknown
3d203da0e0 fixes to make the code compile with gcc 2.95
BitKeeper/etc/ignore:
  Added include/openssl to the ignore list
2006-02-28 22:07:14 +01:00
unknown
d25c405dc7 After merge fixes
BitKeeper/etc/ignore:
  added storage/ndb/src/common/util/testBitmask.cpp
mysql-test/mysql-test-run.sh:
  Add libmysql_r/.libs to path for shared libraries.
  (Needed for mysqlimport)
mysql-test/r/ctype_cp932_notembedded.result:
  After merge fix
mysql-test/r/func_system.result:
  Version number on embedded server can be longer than 40
mysql-test/r/partition_mgm_err.result:
  Move tests that require symlinks to partion_mgm_err2.test
mysql-test/r/query_cache.result:
  Fix possible errors from previous tests
mysql-test/t/ctype_cp932_notembedded.test:
  After merge fix
mysql-test/t/func_system.test:
  Version number on embedded server can be longer than 40
mysql-test/t/partition_mgm_err.test:
  Move tests that require symlinks to partion_mgm_err2.test
mysql-test/t/query_cache.test:
  Fix possible errors from previous tests
mysys/my_symlink2.c:
  More debugging
sql/event.cc:
  Code cleanup
sql/event_executor.cc:
  Ensure that event mutexes are properly cleared up
sql/mysqld.cc:
  Ensure that event mutexes are properly cleared up
mysql-test/r/partition_mgm_err2.result:
  New BitKeeper file ``mysql-test/r/partition_mgm_err2.result''
mysql-test/t/partition_mgm_err2.test:
  New BitKeeper file ``mysql-test/t/partition_mgm_err2.test''
2006-02-26 15:11:56 +02:00
unknown
1b587ced22 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/func_str.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/t/disabled.def:
  Resolve conflict
2006-02-17 10:59:47 -08:00
unknown
eae6679fd4 Fix subselect results (there was a bad merge when subselect test was disabled)
BitKeeper/etc/ignore:
  Added scripts/mysql_upgrade to the ignore list
mysql-test/r/subselect.result:
  Update results
2006-02-17 10:02:59 -08:00
unknown
ca417a74a7 WL#2645 (CHECK FOR UPGRADE)
5.1-related fixes


BitKeeper/etc/ignore:
  Added scripts/mysql_upgrade to the ignore list
sql/ha_partition.cc:
  ha_check and ha_repair now to be called
sql/handler.cc:
  code modified to be 5.1 compliant
2006-02-17 13:37:37 +04:00
unknown
d297a221fe Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/ndb/include/logger/LogHandler.hpp:
  Auto merged
storage/ndb/include/logger/Logger.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/logger/SysLogHandler.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
zlib/Makefile.am:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged
mysql-test/t/information_schema.test:
  Manual merge.
sql/ha_archive.cc:
  Manual merge.
sql/share/errmsg.txt:
  SCCS merged
tests/mysql_client_test.c:
  Manual merge.
2006-02-02 23:27:06 +03:00
unknown
99f9a601ca Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new


BitKeeper/etc/ignore:
  Added BitKeeper/etc/RESYNC_TREE to the ignore list
client/mysqltest.c:
  merged
mysql-test/r/mysqltest.result:
  merged
mysql-test/t/mysqltest.test:
  merged
2006-01-30 20:58:17 -07:00
unknown
f9bef505ec Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root


BitKeeper/etc/ignore:
  auto-union
libmysql/Makefile.shared:
  Auto merged
configure.in:
  Manual merge.
libmysql/libmysql.c:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
2006-01-18 15:15:09 +03:00
unknown
91b4e6b544 BUG#3074: Unversioned symbols in shared library
libmysqlclient versioning when linked with GNU ld.


BitKeeper/etc/ignore:
  Added libmysql/libmysql.ver to the ignore list
configure.in:
  libmysqlclient versioning when linked with GNU ld.
libmysql/Makefile.shared:
  libmysqlclient versioning when linked with GNU ld.
libmysql/libmysql.ver.in:
  New BitKeeper file ``libmysql/libmysql.ver.in''
2006-01-17 18:51:08 +04:00
unknown
848235f797 Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/type_time.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
client/Makefile.am:
  Add my_user.c
include/Makefile.am:
  Add my_user.c
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/t/disabled.def:
  Enable type_time.test
sql/sql_parse.cc:
  Merge.
2006-01-13 19:09:27 +03:00
unknown
997dabfd05 coreect build error without ndb
BitKeeper/etc/ignore:
  Added libmysqld/event.cc libmysqld/event_executor.cc libmysqld/event_timed.cc to the ignore list
2006-01-13 09:42:49 +01:00
unknown
0f30b9d7fc updated mysql-test-run.pl to adjust to ndb replication testing
BitKeeper/etc/ignore:
  Added libmysqld/ha_ndbcluster_binlog.cc libmysqld/rpl_injector.cc to the ignore list
2006-01-13 03:13:58 +01:00
unknown
45a4daa43f bug: replication of table spaces to work
bug: check if storage engine is enabled to avoif code dump


BitKeeper/etc/ignore:
  Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list
2006-01-11 19:49:38 +01:00
unknown
d4d29edb83 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.


BitKeeper/etc/ignore:
  added client/my_user.c libmysqld/my_user.c sql/my_user.c
client/Makefile.am:
  Use my_user.c in linking of mysqldump executable.
client/mysqldump.c:
  Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause)
include/Makefile.am:
  Add my_user.c
include/mysql_com.h:
  Introduce a constant for max user length.
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/r/mysqldump.result:
  Update result file.
sql-common/Makefile.am:
  Add my_user.c
sql/Makefile.am:
  Add my_user.c
sql/sp.cc:
  Use constant for max user length.
sql/sp_head.cc:
  Use common function to parse user value.
sql/sql_acl.cc:
  Use constant for max user length.
sql/sql_parse.cc:
  Use constant for max user length.
sql/sql_show.cc:
  Use constant for max user length.
sql/sql_trigger.cc:
  Use constant for max user length.
include/my_user.h:
  A header file for parse_user().
sql-common/my_user.c:
  A new file for parse_user() implementation.
2006-01-11 02:07:40 +03:00
unknown
b9e67f4319 ignore:
added item_xmlfunc.cc


BitKeeper/etc/ignore:
  added item_xmlfunc.cc
2005-12-26 12:16:28 +04:00
unknown
c493d10260 Fixed compile errors (when compiling in debug mode)
BitKeeper/etc/ignore:
  added storage/archive/archive_test
2005-12-25 16:34:10 +02:00
unknown
fd2beeda33 Fix innodb result file (merge clean-up)
BitKeeper/etc/ignore:
  added client/mysqlslap
mysql-test/r/innodb.result:
  Update results
2005-12-06 19:55:48 -08:00
unknown
fe5c29ed66 Import BDB 4.4.16
BitKeeper/deleted/.del-BerkeleyDB.wsp~262cad82bbee330e:
  Delete: storage/bdb/build_vxworks/BerkeleyDB.wsp
BitKeeper/deleted/.del-db_deadlock.c~e66b27126703863b:
  Delete: storage/bdb/build_vxworks/db_deadlock/db_deadlock.c
BitKeeper/deleted/.del-README~e7bed2181d0721fc:
  Delete: storage/bdb/build_vxworks/dbdemo/README
BitKeeper/deleted/.del-checkapi.prl~9cff93a620c4d6ee:
  Delete: storage/bdb/libdb_java/checkapi.prl
BitKeeper/deleted/.del-com_sleepycat_db_Db.h~5be8fdbd82dc66ff:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_Db.h
BitKeeper/deleted/.del-com_sleepycat_db_DbEnv.h~561e86491f216398:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_DbEnv.h
BitKeeper/deleted/.del-com_sleepycat_db_DbLock.h~99691cceb677fb03:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_DbLock.h
BitKeeper/deleted/.del-com_sleepycat_db_DbLogc.h~285d0bf42cc42e7:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_DbLogc.h
BitKeeper/deleted/.del-com_sleepycat_db_DbLsn.h~3541030a6ddecbce:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_DbLsn.h
BitKeeper/deleted/.del-com_sleepycat_db_DbTxn.h~93b5284933625666:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_DbTxn.h
BitKeeper/deleted/.del-com_sleepycat_db_DbUtil.h~7e57707ff193506b:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_DbUtil.h
BitKeeper/deleted/.del-com_sleepycat_db_Dbc.h~ada851088fc835cf:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_Dbc.h
BitKeeper/deleted/.del-com_sleepycat_db_Dbt.h~a0f565bbacdbef6f:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_Dbt.h
BitKeeper/deleted/.del-com_sleepycat_db_xa_DbXAResource.h~422d8d531f84b16d:
  Delete: storage/bdb/libdb_java/com_sleepycat_db_xa_DbXAResource.h
BitKeeper/deleted/.del-java_Db.c~58bb1812dfe5854b:
  Delete: storage/bdb/libdb_java/java_Db.c
BitKeeper/deleted/.del-java_DbEnv.c~a2df07a3a8eb0a3:
  Delete: storage/bdb/libdb_java/java_DbEnv.c
BitKeeper/deleted/.del-java_DbLock.c~14752f3d17ce5091:
  Delete: storage/bdb/libdb_java/java_DbLock.c
BitKeeper/deleted/.del-java_DbLogc.c~32b9f5a0d8ae00e1:
  Delete: storage/bdb/libdb_java/java_DbLogc.c
BitKeeper/deleted/.del-java_DbLsn.c~397bce0c2e9acfae:
  Delete: storage/bdb/libdb_java/java_DbLsn.c
BitKeeper/deleted/.del-java_DbTxn.c~d9dc40ebae01406c:
  Delete: storage/bdb/libdb_java/java_DbTxn.c
BitKeeper/deleted/.del-java_DbUtil.c~f5ec02c726cdc2c8:
  Delete: storage/bdb/libdb_java/java_DbUtil.c
BitKeeper/deleted/.del-java_DbXAResource.c~2975bdce5f7ded66:
  Delete: storage/bdb/libdb_java/java_DbXAResource.c
BitKeeper/deleted/.del-java_Dbc.c~c2bfc34d203f2b41:
  Delete: storage/bdb/libdb_java/java_Dbc.c
BitKeeper/deleted/.del-java_Dbt.c~f24bd7e6d3dea272:
  Delete: storage/bdb/libdb_java/java_Dbt.c
BitKeeper/deleted/.del-java_info.c~94759fff93603d0c:
  Delete: storage/bdb/libdb_java/java_info.c
BitKeeper/deleted/.del-java_info.h~3ca48c25797cc075:
  Delete: storage/bdb/libdb_java/java_info.h
BitKeeper/deleted/.del-java_locked.c~c9804f625a17266f:
  Delete: storage/bdb/libdb_java/java_locked.c
BitKeeper/deleted/.del-java_locked.h~106fa45bdca6557:
  Delete: storage/bdb/libdb_java/java_locked.h
BitKeeper/deleted/.del-java_util.c~62c948a9959d3314:
  Delete: storage/bdb/libdb_java/java_util.c
BitKeeper/deleted/.del-java_util.h~a5a6e3e7658a0698:
  Delete: storage/bdb/libdb_java/java_util.h
BitKeeper/deleted/.del-os_vx_abs.c~c4cb2766797c82c:
  Delete: storage/bdb/os_vxworks/os_vx_abs.c
BitKeeper/deleted/.del-os_vx_config.c~2547fc9b4b798ec9:
  Delete: storage/bdb/os_vxworks/os_vx_config.c
BitKeeper/deleted/.del-os_vx_map.c~dde2102a8138f39a:
  Delete: storage/bdb/os_vxworks/os_vx_map.c
BitKeeper/deleted/.del-client.c~778f726f92c4b8c1:
  Delete: storage/bdb/rpc_client/client.c
BitKeeper/deleted/.del-gen_client_ret.c~baf03786112281b1:
  Delete: storage/bdb/rpc_client/gen_client_ret.c
BitKeeper/deleted/.del-clsrv.html~bedbc23a6299a5ef:
  Delete: storage/bdb/rpc_server/clsrv.html
BitKeeper/deleted/.del-rpc.src~5b16d10e77c12a07:
  Delete: storage/bdb/rpc_server/rpc.src
BitKeeper/deleted/.del-db_server_proc.c.in~8f21c610b1adde21:
  Delete: storage/bdb/rpc_server/c/db_server_proc.c.in
BitKeeper/deleted/.del-db_server_util.c~ba8fb3cb91ce91a2:
  Delete: storage/bdb/rpc_server/c/db_server_util.c
BitKeeper/deleted/.del-db_server_cxxproc.cpp~2654e937e22057b8:
  Delete: storage/bdb/rpc_server/cxx/db_server_cxxproc.cpp
BitKeeper/deleted/.del-db_server_cxxutil.cpp~479fef66225389c3:
  Delete: storage/bdb/rpc_server/cxx/db_server_cxxutil.cpp
BitKeeper/deleted/.del-DbDispatcher.java~fa17538a88d55d31:
  Delete: storage/bdb/rpc_server/java/DbDispatcher.java
BitKeeper/deleted/.del-DbServer.java~f9e1d547eb31538:
  Delete: storage/bdb/rpc_server/java/DbServer.java
BitKeeper/deleted/.del-FreeList.java~45b070457c62935c:
  Delete: storage/bdb/rpc_server/java/FreeList.java
BitKeeper/deleted/.del-LocalIterator.java~8cb6df07b817589:
  Delete: storage/bdb/rpc_server/java/LocalIterator.java
BitKeeper/deleted/.del-README~ba12e6afe01eccdb:
  Delete: storage/bdb/rpc_server/java/README
BitKeeper/deleted/.del-RpcDb.java~f3a512764051fc91:
  Delete: storage/bdb/rpc_server/java/RpcDb.java
BitKeeper/deleted/.del-RpcDbEnv.java~30a49486a552aebe:
  Delete: storage/bdb/rpc_server/java/RpcDbEnv.java
BitKeeper/deleted/.del-RpcDbTxn.java~1488264fee2347f0:
  Delete: storage/bdb/rpc_server/java/RpcDbTxn.java
BitKeeper/deleted/.del-RpcDbc.java~e3dee34ecd9224c:
  Delete: storage/bdb/rpc_server/java/RpcDbc.java
BitKeeper/deleted/.del-Timer.java~eac869c015ad1fc2:
  Delete: storage/bdb/rpc_server/java/Timer.java
BitKeeper/deleted/.del-jrpcgen.jar~96b782a68a231bd:
  Delete: storage/bdb/rpc_server/java/jrpcgen.jar
BitKeeper/deleted/.del-oncrpc.jar~f0588659d0f723c:
  Delete: storage/bdb/rpc_server/java/oncrpc.jar
BitKeeper/deleted/.del-DbServerStub.java~412a16b22ae914c5:
  Delete: storage/bdb/rpc_server/java/gen/DbServerStub.java
BitKeeper/deleted/.del-s_jrpcgen~eea48620d17035ff:
  Delete: storage/bdb/rpc_server/java/s_jrpcgen
BitKeeper/deleted/.del-__db_associate_msg.java~ead380cad8a83405:
  Delete: storage/bdb/rpc_server/java/gen/__db_associate_msg.java
BitKeeper/deleted/.del-__db_associate_reply.java~50abd1ffed116bfc:
  Delete: storage/bdb/rpc_server/java/gen/__db_associate_reply.java
BitKeeper/deleted/.del-__db_bt_maxkey_msg.java~9870e67c8420d97e:
  Delete: storage/bdb/rpc_server/java/gen/__db_bt_maxkey_msg.java
BitKeeper/deleted/.del-__db_bt_maxkey_reply.java~25c4caf1c0b1917a:
  Delete: storage/bdb/rpc_server/java/gen/__db_bt_maxkey_reply.java
BitKeeper/deleted/.del-__db_bt_minkey_msg.java~7eb5c14fb24b9d6a:
  Delete: storage/bdb/rpc_server/java/gen/__db_bt_minkey_msg.java
BitKeeper/deleted/.del-__db_bt_minkey_reply.java~bca9c5ea81c46760:
  Delete: storage/bdb/rpc_server/java/gen/__db_bt_minkey_reply.java
BitKeeper/deleted/.del-__db_close_msg.java~f04ee69a1ba56835:
  Delete: storage/bdb/rpc_server/java/gen/__db_close_msg.java
BitKeeper/deleted/.del-__db_close_reply.java~b28cc0d86864f4e4:
  Delete: storage/bdb/rpc_server/java/gen/__db_close_reply.java
BitKeeper/deleted/.del-__db_create_msg.java~1aaa9e535b899a04:
  Delete: storage/bdb/rpc_server/java/gen/__db_create_msg.java
BitKeeper/deleted/.del-__db_create_reply.java~4d1ec958b6e49be8:
  Delete: storage/bdb/rpc_server/java/gen/__db_create_reply.java
BitKeeper/deleted/.del-__db_cursor_msg.java~cf76a6ca7b0a55c1:
  Delete: storage/bdb/rpc_server/java/gen/__db_cursor_msg.java
BitKeeper/deleted/.del-__db_cursor_reply.java~f001474e68713f66:
  Delete: storage/bdb/rpc_server/java/gen/__db_cursor_reply.java
BitKeeper/deleted/.del-__db_del_msg.java~941d3f21685abda5:
  Delete: storage/bdb/rpc_server/java/gen/__db_del_msg.java
BitKeeper/deleted/.del-__db_del_reply.java~86d1a74e7667c534:
  Delete: storage/bdb/rpc_server/java/gen/__db_del_reply.java
BitKeeper/deleted/.del-__db_encrypt_msg.java~e471e1131c7c9991:
  Delete: storage/bdb/rpc_server/java/gen/__db_encrypt_msg.java
BitKeeper/deleted/.del-__db_encrypt_reply.java~77eaf465989f374f:
  Delete: storage/bdb/rpc_server/java/gen/__db_encrypt_reply.java
BitKeeper/deleted/.del-__db_extentsize_msg.java~98b41250d80d7f25:
  Delete: storage/bdb/rpc_server/java/gen/__db_extentsize_msg.java
BitKeeper/deleted/.del-__db_extentsize_reply.java~5a19d472b4c78471:
  Delete: storage/bdb/rpc_server/java/gen/__db_extentsize_reply.java
BitKeeper/deleted/.del-__db_flags_msg.java~441eed476fac3b75:
  Delete: storage/bdb/rpc_server/java/gen/__db_flags_msg.java
BitKeeper/deleted/.del-__db_flags_reply.java~fbe276e35c025e85:
  Delete: storage/bdb/rpc_server/java/gen/__db_flags_reply.java
BitKeeper/deleted/.del-__db_get_msg.java~5862039845a2e82e:
  Delete: storage/bdb/rpc_server/java/gen/__db_get_msg.java
BitKeeper/deleted/.del-__db_get_reply.java~13a5b37f6e1c75a6:
  Delete: storage/bdb/rpc_server/java/gen/__db_get_reply.java
BitKeeper/deleted/.del-__db_h_ffactor_msg.java~3ae99a79bbc32ace:
  Delete: storage/bdb/rpc_server/java/gen/__db_h_ffactor_msg.java
BitKeeper/deleted/.del-__db_h_ffactor_reply.java~49fa9e30aa29cf15:
  Delete: storage/bdb/rpc_server/java/gen/__db_h_ffactor_reply.java
BitKeeper/deleted/.del-__db_h_nelem_msg.java~a74540e24c2376ac:
  Delete: storage/bdb/rpc_server/java/gen/__db_h_nelem_msg.java
BitKeeper/deleted/.del-__db_h_nelem_reply.java~fdefe84280309a69:
  Delete: storage/bdb/rpc_server/java/gen/__db_h_nelem_reply.java
BitKeeper/deleted/.del-__db_join_msg.java~bb9bae2ff960548:
  Delete: storage/bdb/rpc_server/java/gen/__db_join_msg.java
BitKeeper/deleted/.del-__db_join_reply.java~938be1f7a7fa1d8d:
  Delete: storage/bdb/rpc_server/java/gen/__db_join_reply.java
BitKeeper/deleted/.del-__db_key_range_msg.java~c8d5cc3c2dc970d4:
  Delete: storage/bdb/rpc_server/java/gen/__db_key_range_msg.java
BitKeeper/deleted/.del-__db_key_range_reply.java~92b341e0314f22d9:
  Delete: storage/bdb/rpc_server/java/gen/__db_key_range_reply.java
BitKeeper/deleted/.del-__db_lorder_msg.java~db0ee150bd760a09:
  Delete: storage/bdb/rpc_server/java/gen/__db_lorder_msg.java
BitKeeper/deleted/.del-__db_lorder_reply.java~e22ba9a03ff14a74:
  Delete: storage/bdb/rpc_server/java/gen/__db_lorder_reply.java
BitKeeper/deleted/.del-__db_open_msg.java~dc63c84feda071ee:
  Delete: storage/bdb/rpc_server/java/gen/__db_open_msg.java
BitKeeper/deleted/.del-__db_open_reply.java~cc17c92d41c40:
  Delete: storage/bdb/rpc_server/java/gen/__db_open_reply.java
BitKeeper/deleted/.del-__db_pagesize_msg.java~448d1d04d3c7220f:
  Delete: storage/bdb/rpc_server/java/gen/__db_pagesize_msg.java
BitKeeper/deleted/.del-__db_pagesize_reply.java~cddff625518b077c:
  Delete: storage/bdb/rpc_server/java/gen/__db_pagesize_reply.java
BitKeeper/deleted/.del-__db_pget_msg.java~d47b18162af92a04:
  Delete: storage/bdb/rpc_server/java/gen/__db_pget_msg.java
BitKeeper/deleted/.del-__db_pget_reply.java~51e8ec0bb4a42ddb:
  Delete: storage/bdb/rpc_server/java/gen/__db_pget_reply.java
BitKeeper/deleted/.del-__db_put_msg.java~11d62e0be1df9770:
  Delete: storage/bdb/rpc_server/java/gen/__db_put_msg.java
BitKeeper/deleted/.del-__db_put_reply.java~237edfe6e16b98dc:
  Delete: storage/bdb/rpc_server/java/gen/__db_put_reply.java
BitKeeper/deleted/.del-__db_re_delim_msg.java~6f1d8808ae1268f7:
  Delete: storage/bdb/rpc_server/java/gen/__db_re_delim_msg.java
BitKeeper/deleted/.del-__db_re_delim_reply.java~9b3748da6051f58f:
  Delete: storage/bdb/rpc_server/java/gen/__db_re_delim_reply.java
BitKeeper/deleted/.del-__db_re_len_msg.java~b81150167375308c:
  Delete: storage/bdb/rpc_server/java/gen/__db_re_len_msg.java
BitKeeper/deleted/.del-__db_re_len_reply.java~cd4a1c758256deed:
  Delete: storage/bdb/rpc_server/java/gen/__db_re_len_reply.java
BitKeeper/deleted/.del-__db_re_pad_msg.java~bf9899217833aab7:
  Delete: storage/bdb/rpc_server/java/gen/__db_re_pad_msg.java
BitKeeper/deleted/.del-__db_re_pad_reply.java~1617988ae3b4ed7:
  Delete: storage/bdb/rpc_server/java/gen/__db_re_pad_reply.java
BitKeeper/deleted/.del-__db_remove_msg.java~6500258dda02905:
  Delete: storage/bdb/rpc_server/java/gen/__db_remove_msg.java
BitKeeper/deleted/.del-__db_remove_reply.java~2f120860c28c2147:
  Delete: storage/bdb/rpc_server/java/gen/__db_remove_reply.java
BitKeeper/deleted/.del-__db_rename_msg.java~e257f5621523c010:
  Delete: storage/bdb/rpc_server/java/gen/__db_rename_msg.java
BitKeeper/deleted/.del-__db_rename_reply.java~3d9b0d71ddef1e4f:
  Delete: storage/bdb/rpc_server/java/gen/__db_rename_reply.java
BitKeeper/deleted/.del-__db_stat_msg.java~18777f8abf4c6db7:
  Delete: storage/bdb/rpc_server/java/gen/__db_stat_msg.java
BitKeeper/deleted/.del-__db_stat_reply.java~c65aa70ee0b3fa4b:
  Delete: storage/bdb/rpc_server/java/gen/__db_stat_reply.java
BitKeeper/deleted/.del-__db_sync_msg.java~2d528efa77b52f8e:
  Delete: storage/bdb/rpc_server/java/gen/__db_sync_msg.java
BitKeeper/deleted/.del-__db_sync_reply.java~4618b14ca6182d1c:
  Delete: storage/bdb/rpc_server/java/gen/__db_sync_reply.java
BitKeeper/deleted/.del-__db_truncate_msg.java~7f0b791efc19d01:
  Delete: storage/bdb/rpc_server/java/gen/__db_truncate_msg.java
BitKeeper/deleted/.del-__db_truncate_reply.java~6b546b15b67c4b10:
  Delete: storage/bdb/rpc_server/java/gen/__db_truncate_reply.java
BitKeeper/deleted/.del-__dbc_close_msg.java~dec9c28a443eded7:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_close_msg.java
BitKeeper/deleted/.del-__dbc_close_reply.java~936e3d08683e1807:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_close_reply.java
BitKeeper/deleted/.del-__dbc_count_msg.java~596f6137c3cbb9f:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_count_msg.java
BitKeeper/deleted/.del-__dbc_count_reply.java~2f9ae9c77e69db07:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_count_reply.java
BitKeeper/deleted/.del-__dbc_del_msg.java~e3ee262c41809935:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_del_msg.java
BitKeeper/deleted/.del-__dbc_del_reply.java~b30ad669b593c26e:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_del_reply.java
BitKeeper/deleted/.del-__dbc_dup_msg.java~a507a9f28cb94fd9:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_dup_msg.java
BitKeeper/deleted/.del-__dbc_dup_reply.java~e14ee0a887f36027:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_dup_reply.java
BitKeeper/deleted/.del-__dbc_get_msg.java~38d851bc7f22434f:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_get_msg.java
BitKeeper/deleted/.del-__dbc_get_reply.java~a2c3a3c61d891a43:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_get_reply.java
BitKeeper/deleted/.del-__dbc_pget_msg.java~68be7ca3574c35e8:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_pget_msg.java
BitKeeper/deleted/.del-__dbc_pget_reply.java~d7a142e0d03d215:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_pget_reply.java
BitKeeper/deleted/.del-__dbc_put_msg.java~8ffa5f73f1dc24a8:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_put_msg.java
BitKeeper/deleted/.del-__dbc_put_reply.java~fa591c2170712742:
  Delete: storage/bdb/rpc_server/java/gen/__dbc_put_reply.java
BitKeeper/deleted/.del-__env_cachesize_msg.java~e1617ac675f39ff9:
  Delete: storage/bdb/rpc_server/java/gen/__env_cachesize_msg.java
BitKeeper/deleted/.del-__env_cachesize_reply.java~46d61203dc67225a:
  Delete: storage/bdb/rpc_server/java/gen/__env_cachesize_reply.java
BitKeeper/deleted/.del-__env_close_msg.java~2b7cf5642c11b060:
  Delete: storage/bdb/rpc_server/java/gen/__env_close_msg.java
BitKeeper/deleted/.del-__env_close_reply.java~e7e5a0bd1ac10bb5:
  Delete: storage/bdb/rpc_server/java/gen/__env_close_reply.java
BitKeeper/deleted/.del-__env_create_msg.java~a232d9b338470735:
  Delete: storage/bdb/rpc_server/java/gen/__env_create_msg.java
BitKeeper/deleted/.del-__env_create_reply.java~349471db68b992c:
  Delete: storage/bdb/rpc_server/java/gen/__env_create_reply.java
BitKeeper/deleted/.del-__env_dbremove_msg.java~e4fcb5d31ea42840:
  Delete: storage/bdb/rpc_server/java/gen/__env_dbremove_msg.java
BitKeeper/deleted/.del-__env_dbremove_reply.java~6ad639e29ee2c24d:
  Delete: storage/bdb/rpc_server/java/gen/__env_dbremove_reply.java
BitKeeper/deleted/.del-__env_dbrename_msg.java~e4082b7dda94a15e:
  Delete: storage/bdb/rpc_server/java/gen/__env_dbrename_msg.java
BitKeeper/deleted/.del-__env_dbrename_reply.java~a514af5890b9c792:
  Delete: storage/bdb/rpc_server/java/gen/__env_dbrename_reply.java
BitKeeper/deleted/.del-__env_encrypt_msg.java~68541e7234a74fff:
  Delete: storage/bdb/rpc_server/java/gen/__env_encrypt_msg.java
BitKeeper/deleted/.del-__env_encrypt_reply.java~3acfdefa98f6e4ad:
  Delete: storage/bdb/rpc_server/java/gen/__env_encrypt_reply.java
BitKeeper/deleted/.del-__env_flags_msg.java~5868dc483eaea72d:
  Delete: storage/bdb/rpc_server/java/gen/__env_flags_msg.java
BitKeeper/deleted/.del-__env_flags_reply.java~665b55b6cf470004:
  Delete: storage/bdb/rpc_server/java/gen/__env_flags_reply.java
BitKeeper/deleted/.del-__env_open_msg.java~aabfb33c7b09cf55:
  Delete: storage/bdb/rpc_server/java/gen/__env_open_msg.java
BitKeeper/deleted/.del-__env_open_reply.java~7cdc7e4f38510648:
  Delete: storage/bdb/rpc_server/java/gen/__env_open_reply.java
BitKeeper/deleted/.del-__env_remove_msg.java~6a21875bb076d162:
  Delete: storage/bdb/rpc_server/java/gen/__env_remove_msg.java
BitKeeper/deleted/.del-__env_remove_reply.java~76663da926423372:
  Delete: storage/bdb/rpc_server/java/gen/__env_remove_reply.java
BitKeeper/deleted/.del-__txn_abort_msg.java~f8e890f75d0f694b:
  Delete: storage/bdb/rpc_server/java/gen/__txn_abort_msg.java
BitKeeper/deleted/.del-__txn_abort_reply.java~678ad0b6363c2758:
  Delete: storage/bdb/rpc_server/java/gen/__txn_abort_reply.java
BitKeeper/deleted/.del-__txn_begin_msg.java~b783c040ab7afcb1:
  Delete: storage/bdb/rpc_server/java/gen/__txn_begin_msg.java
BitKeeper/deleted/.del-__txn_begin_reply.java~92bff8b98e06b023:
  Delete: storage/bdb/rpc_server/java/gen/__txn_begin_reply.java
BitKeeper/deleted/.del-__txn_commit_msg.java~5a40acc93f71e243:
  Delete: storage/bdb/rpc_server/java/gen/__txn_commit_msg.java
BitKeeper/deleted/.del-__txn_commit_reply.java~f532e87a8f8ba8a8:
  Delete: storage/bdb/rpc_server/java/gen/__txn_commit_reply.java
BitKeeper/deleted/.del-__txn_discard_msg.java~cf3b52abd646bbe:
  Delete: storage/bdb/rpc_server/java/gen/__txn_discard_msg.java
BitKeeper/deleted/.del-__txn_discard_reply.java~695b92637d8c6107:
  Delete: storage/bdb/rpc_server/java/gen/__txn_discard_reply.java
BitKeeper/deleted/.del-__txn_prepare_msg.java~9547b20ee838b37f:
  Delete: storage/bdb/rpc_server/java/gen/__txn_prepare_msg.java
BitKeeper/deleted/.del-__txn_prepare_reply.java~2c9e2f8435b960cd:
  Delete: storage/bdb/rpc_server/java/gen/__txn_prepare_reply.java
BitKeeper/deleted/.del-__txn_recover_msg.java~e8b91e7a491bf424:
  Delete: storage/bdb/rpc_server/java/gen/__txn_recover_msg.java
BitKeeper/deleted/.del-__txn_recover_reply.java~4548cbca6b058d06:
  Delete: storage/bdb/rpc_server/java/gen/__txn_recover_reply.java
BitKeeper/deleted/.del-db_server.java~7da469d45426b310:
  Delete: storage/bdb/rpc_server/java/gen/db_server.java
BitKeeper/deleted/.del-Btree.pm~d7ddd8ca99da1884:
  Delete: storage/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm
BitKeeper/deleted/.del-Hash.pm~6c3032fb51011864:
  Delete: storage/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm
BitKeeper/deleted/.del-BerkeleyDB.pm~b36f7b4b21d6a326:
  Delete: storage/bdb/perl/BerkeleyDB/BerkeleyDB.pm
BitKeeper/deleted/.del-BerkeleyDB.pod~cf47ec2bb9d97c80:
  Delete: storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod
BitKeeper/deleted/.del-BerkeleyDB.pod.P~be77a6f219f7803f:
  Delete: storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P
BitKeeper/deleted/.del-BerkeleyDB.xs~46038b9ecc2b0994:
  Delete: storage/bdb/perl/BerkeleyDB/BerkeleyDB.xs
BitKeeper/deleted/.del-Changes~51eceef1511d2b8e:
  Delete: storage/bdb/perl/BerkeleyDB/Changes
BitKeeper/deleted/.del-MANIFEST~82a35c39f9f9dc92:
  Delete: storage/bdb/perl/BerkeleyDB/MANIFEST
BitKeeper/deleted/.del-META.yml~5d2eb91de2ace77:
  Delete: storage/bdb/perl/BerkeleyDB/META.yml
BitKeeper/deleted/.del-Makefile.PL~6c30b40064dc93bc:
  Delete: storage/bdb/perl/BerkeleyDB/Makefile.PL
BitKeeper/deleted/.del-README~2c9091895ce880ad:
  Delete: storage/bdb/perl/BerkeleyDB/README
BitKeeper/deleted/.del-Todo~31c9e469be7d7fce:
  Delete: storage/bdb/perl/BerkeleyDB/Todo
BitKeeper/deleted/.del-config.in~5ee173677818dc79:
  Delete: storage/bdb/perl/BerkeleyDB/config.in
BitKeeper/deleted/.del-constants.h~ef5ed100dd4398b9:
  Delete: storage/bdb/perl/BerkeleyDB/constants.h
BitKeeper/deleted/.del-constants.xs~9f261dece7663f4:
  Delete: storage/bdb/perl/BerkeleyDB/constants.xs
BitKeeper/deleted/.del-dbinfo~143868bf1fee3891:
  Delete: storage/bdb/perl/BerkeleyDB/dbinfo
BitKeeper/deleted/.del-mkconsts~d6db2129cd65a044:
  Delete: storage/bdb/perl/BerkeleyDB/mkconsts
BitKeeper/deleted/.del-mkpod~86cf6dafc3259b14:
  Delete: storage/bdb/perl/BerkeleyDB/mkpod
BitKeeper/deleted/.del-ppport.h~e8e959489bac6b4e:
  Delete: storage/bdb/perl/BerkeleyDB/ppport.h
BitKeeper/deleted/.del-scan~d41c8bfdde29e0ee:
  Delete: storage/bdb/perl/BerkeleyDB/scan
BitKeeper/deleted/.del-dec_osf.pl~bb1dd3f7343acea1:
  Delete: storage/bdb/perl/BerkeleyDB/hints/dec_osf.pl
BitKeeper/deleted/.del-typemap~bc62fd16304b335c:
  Delete: storage/bdb/perl/BerkeleyDB/typemap
BitKeeper/deleted/.del-irix_6_5.pl~6cf1332ac7c6d177:
  Delete: storage/bdb/perl/BerkeleyDB/hints/irix_6_5.pl
BitKeeper/deleted/.del-5.004~80083b2782fae3b1:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.004
BitKeeper/deleted/.del-solaris.pl~b7440db23153ada1:
  Delete: storage/bdb/perl/BerkeleyDB/hints/solaris.pl
BitKeeper/deleted/.del-5.004_01~5e653651e8e3819:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.004_01
BitKeeper/deleted/.del-5.004_02~1a8749849460471d:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.004_02
BitKeeper/deleted/.del-5.004_03~e3fefc28c49ad553:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.004_03
BitKeeper/deleted/.del-5.004_04~2acad6626738297f:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.004_04
BitKeeper/deleted/.del-5.004_05~740d60296a10e2b6:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.004_05
BitKeeper/deleted/.del-5.005~4df32971d111b075:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.005
BitKeeper/deleted/.del-5.005_01~fc87edb6772b5b6c:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.005_01
BitKeeper/deleted/.del-5.005_02~31d0796db6079b6a:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.005_02
BitKeeper/deleted/.del-5.005_03~a9e6b8287f9f0348:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.005_03
BitKeeper/deleted/.del-5.6.0~48068342df311cef:
  Delete: storage/bdb/perl/BerkeleyDB/patches/5.6.0
BitKeeper/deleted/.del-btree.t~e009d5c64dabc628:
  Delete: storage/bdb/perl/BerkeleyDB/t/btree.t
BitKeeper/deleted/.del-cds.t~6393f9b74adda854:
  Delete: storage/bdb/perl/BerkeleyDB/t/cds.t
BitKeeper/deleted/.del-destroy.t~aed694cd9448ef26:
  Delete: storage/bdb/perl/BerkeleyDB/t/destroy.t
BitKeeper/deleted/.del-encrypt.t~91e1152aa288384d:
  Delete: storage/bdb/perl/BerkeleyDB/t/encrypt.t
BitKeeper/deleted/.del-env.t~c1aa03091db9670:
  Delete: storage/bdb/perl/BerkeleyDB/t/env.t
BitKeeper/deleted/.del-examples.t~b1e3ca3da78b9898:
  Delete: storage/bdb/perl/BerkeleyDB/t/examples.t
BitKeeper/deleted/.del-examples.t.T~c0f55d47f279a7e2:
  Delete: storage/bdb/perl/BerkeleyDB/t/examples.t.T
BitKeeper/deleted/.del-examples3.t.T~452caaaefd5c648b:
  Delete: storage/bdb/perl/BerkeleyDB/t/examples3.t.T
BitKeeper/deleted/.del-examples3.t~f712dfeec05867fb:
  Delete: storage/bdb/perl/BerkeleyDB/t/examples3.t
BitKeeper/deleted/.del-filter.t~48b7f05a43464f11:
  Delete: storage/bdb/perl/BerkeleyDB/t/filter.t
BitKeeper/deleted/.del-hash.t~92eb3848961b229b:
  Delete: storage/bdb/perl/BerkeleyDB/t/hash.t
BitKeeper/deleted/.del-join.t~256f4a5c41c79938:
  Delete: storage/bdb/perl/BerkeleyDB/t/join.t
BitKeeper/deleted/.del-mldbm.t~8189f0dc9b4ef4:
  Delete: storage/bdb/perl/BerkeleyDB/t/mldbm.t
BitKeeper/deleted/.del-pod.t~544de536d7c16d1f:
  Delete: storage/bdb/perl/BerkeleyDB/t/pod.t
BitKeeper/deleted/.del-queue.t~c9c560769cc1cb7b:
  Delete: storage/bdb/perl/BerkeleyDB/t/queue.t
BitKeeper/deleted/.del-recno.t~28b76050831a3cae:
  Delete: storage/bdb/perl/BerkeleyDB/t/recno.t
BitKeeper/deleted/.del-strict.t~20b543351fd50fc0:
  Delete: storage/bdb/perl/BerkeleyDB/t/strict.t
BitKeeper/deleted/.del-subdb.t~56324aaeb936c7f1:
  Delete: storage/bdb/perl/BerkeleyDB/t/subdb.t
BitKeeper/deleted/.del-txn.t~546ac62364616115:
  Delete: storage/bdb/perl/BerkeleyDB/t/txn.t
BitKeeper/deleted/.del-unknown.t~2f5dc0ece63926c4:
  Delete: storage/bdb/perl/BerkeleyDB/t/unknown.t
BitKeeper/deleted/.del-util.pm~27e29eb4fddd71a5:
  Delete: storage/bdb/perl/BerkeleyDB/t/util.pm
BitKeeper/deleted/.del-Changes~f0e3f260c5b81da4:
  Delete: storage/bdb/perl/DB_File/Changes
BitKeeper/deleted/.del-DB_File.pm~108149cc66802405:
  Delete: storage/bdb/perl/DB_File/DB_File.pm
BitKeeper/deleted/.del-DB_File.xs~8c61b34efd458ffc:
  Delete: storage/bdb/perl/DB_File/DB_File.xs
BitKeeper/deleted/.del-DB_File_BS~74e05e841c69424:
  Delete: storage/bdb/perl/DB_File/DB_File_BS
BitKeeper/deleted/.del-MANIFEST~5048670bca9a416:
  Delete: storage/bdb/perl/DB_File/MANIFEST
BitKeeper/deleted/.del-META.yml~99d0c37ae405a9bd:
  Delete: storage/bdb/perl/DB_File/META.yml
BitKeeper/deleted/.del-Makefile.PL~18275ea2225dbf0c:
  Delete: storage/bdb/perl/DB_File/Makefile.PL
BitKeeper/deleted/.del-README~9ca1ac49d099e79a:
  Delete: storage/bdb/perl/DB_File/README
BitKeeper/deleted/.del-config.in~fac3c512af0f372a:
  Delete: storage/bdb/perl/DB_File/config.in
BitKeeper/deleted/.del-dbinfo~9de945c9960a5600:
  Delete: storage/bdb/perl/DB_File/dbinfo
BitKeeper/deleted/.del-fallback.h~9975a2248666cd3e:
  Delete: storage/bdb/perl/DB_File/fallback.h
BitKeeper/deleted/.del-fallback.xs~20972a102becd17c:
  Delete: storage/bdb/perl/DB_File/fallback.xs
BitKeeper/deleted/.del-ppport.h~b24a0fced14b654:
  Delete: storage/bdb/perl/DB_File/ppport.h
BitKeeper/deleted/.del-typemap~5581c211c9caa676:
  Delete: storage/bdb/perl/DB_File/typemap
BitKeeper/deleted/.del-dynixptx.pl~fe52539bc8f324ba:
  Delete: storage/bdb/perl/DB_File/hints/dynixptx.pl
BitKeeper/deleted/.del-version.c~5d8c4ea020639989:
  Delete: storage/bdb/perl/DB_File/version.c
BitKeeper/deleted/.del-sco.pl~3d5472171a399180:
  Delete: storage/bdb/perl/DB_File/hints/sco.pl
BitKeeper/deleted/.del-5.004_01~ff446a68fbd4f0b8:
  Delete: storage/bdb/perl/DB_File/patches/5.004_01
BitKeeper/deleted/.del-5.004~93f4db16a08fd2bc:
  Delete: storage/bdb/perl/DB_File/patches/5.004
BitKeeper/deleted/.del-5.004_02~82bb39971394b02a:
  Delete: storage/bdb/perl/DB_File/patches/5.004_02
BitKeeper/deleted/.del-5.004_03~b7c43469f9885933:
  Delete: storage/bdb/perl/DB_File/patches/5.004_03
BitKeeper/deleted/.del-5.004_04~24f77fc8ce4c05a4:
  Delete: storage/bdb/perl/DB_File/patches/5.004_04
BitKeeper/deleted/.del-5.004_05~edb5ae874e40ac5:
  Delete: storage/bdb/perl/DB_File/patches/5.004_05
BitKeeper/deleted/.del-5.005~71d4c109691053f2:
  Delete: storage/bdb/perl/DB_File/patches/5.005
BitKeeper/deleted/.del-5.005_01~eb5fede99787c288:
  Delete: storage/bdb/perl/DB_File/patches/5.005_01
BitKeeper/deleted/.del-5.005_02~4cd3657759345990:
  Delete: storage/bdb/perl/DB_File/patches/5.005_02
BitKeeper/deleted/.del-5.005_03~18145a5d8ddd06f:
  Delete: storage/bdb/perl/DB_File/patches/5.005_03
BitKeeper/deleted/.del-5.6.0~3697abb57c4fd3b9:
  Delete: storage/bdb/perl/DB_File/patches/5.6.0
BitKeeper/deleted/.del-db-btree.t~154014b7530d8be3:
  Delete: storage/bdb/perl/DB_File/t/db-btree.t
BitKeeper/deleted/.del-db-hash.t~19bb665f32275d9a:
  Delete: storage/bdb/perl/DB_File/t/db-hash.t
BitKeeper/deleted/.del-db-recno.t~8a56bdfc2f73371:
  Delete: storage/bdb/perl/DB_File/t/db-recno.t
BitKeeper/deleted/.del-tcl_compat.c~5a8010d160060a98:
  Delete: storage/bdb/tcl/tcl_compat.c
BitKeeper/deleted/.del-tcl_db.c~8fdaaad2aeeda35e:
  Delete: storage/bdb/tcl/tcl_db.c
BitKeeper/deleted/.del-tcl_db_pkg.c~2f0f287f3831577c:
  Delete: storage/bdb/tcl/tcl_db_pkg.c
BitKeeper/deleted/.del-tcl_dbcursor.c~625ad62ba96af2ed:
  Delete: storage/bdb/tcl/tcl_dbcursor.c
BitKeeper/deleted/.del-tcl_env.c~4f598ca35d3c4f8b:
  Delete: storage/bdb/tcl/tcl_env.c
BitKeeper/deleted/.del-tcl_internal.c~f6ca168017fd06e1:
  Delete: storage/bdb/tcl/tcl_internal.c
BitKeeper/deleted/.del-tcl_lock.c~5a2c6bd823eef42c:
  Delete: storage/bdb/tcl/tcl_lock.c
BitKeeper/deleted/.del-tcl_log.c~a8a8d90da56a5e07:
  Delete: storage/bdb/tcl/tcl_log.c
BitKeeper/deleted/.del-tcl_mp.c~22565406c6a6462b:
  Delete: storage/bdb/tcl/tcl_mp.c
BitKeeper/deleted/.del-tcl_rep.c~e6566d8441250794:
  Delete: storage/bdb/tcl/tcl_rep.c
BitKeeper/deleted/.del-tcl_seq.c~c38c7f7d22abc6de:
  Delete: storage/bdb/tcl/tcl_seq.c
BitKeeper/deleted/.del-tcl_txn.c~e8729bea575a01bb:
  Delete: storage/bdb/tcl/tcl_txn.c
BitKeeper/deleted/.del-tcl_util.c~32bd9f706e204afd:
  Delete: storage/bdb/tcl/tcl_util.c
BitKeeper/deleted/.del-db.html~2cea96773f8bc0a9:
  Delete: storage/bdb/tcl/docs/db.html
BitKeeper/deleted/.del-env.html~882c3ffaf3ea10a6:
  Delete: storage/bdb/tcl/docs/env.html
BitKeeper/deleted/.del-historic.html~27efa50d7af02fa0:
  Delete: storage/bdb/tcl/docs/historic.html
BitKeeper/deleted/.del-index.html~27e6b3e9ca7eb3bc:
  Delete: storage/bdb/tcl/docs/index.html
BitKeeper/deleted/.del-library.html~d60be859a6d3fdbb:
  Delete: storage/bdb/tcl/docs/library.html
BitKeeper/deleted/.del-lock.html~121ccf43b1822008:
  Delete: storage/bdb/tcl/docs/lock.html
BitKeeper/deleted/.del-log.html~d51c4a05bac8893f:
  Delete: storage/bdb/tcl/docs/log.html
BitKeeper/deleted/.del-mpool.html~cad6eba280ff4db1:
  Delete: storage/bdb/tcl/docs/mpool.html
BitKeeper/deleted/.del-rep.html~56203335b51b864a:
  Delete: storage/bdb/tcl/docs/rep.html
BitKeeper/deleted/.del-test.html~987c2f02707fbaa6:
  Delete: storage/bdb/tcl/docs/test.html
BitKeeper/deleted/.del-txn.html~696a0a46ef941059:
  Delete: storage/bdb/tcl/docs/txn.html
BitKeeper/deleted/.del-archive.tcl~8e8c452487960455:
  Delete: storage/bdb/test/archive.tcl
BitKeeper/deleted/.del-bigfile001.tcl~899a31b17c2dc7e2:
  Delete: storage/bdb/test/bigfile001.tcl
BitKeeper/deleted/.del-bigfile002.tcl~3ff5b1b29cc2d9f0:
  Delete: storage/bdb/test/bigfile002.tcl
BitKeeper/deleted/.del-byteorder.tcl~fa49cd99b5ef4a27:
  Delete: storage/bdb/test/byteorder.tcl
BitKeeper/deleted/.del-conscript.tcl~52f54459d6ba9e1f:
  Delete: storage/bdb/test/conscript.tcl
BitKeeper/deleted/.del-dbm.tcl~fc57479c1349169c:
  Delete: storage/bdb/test/dbm.tcl
BitKeeper/deleted/.del-dbscript.tcl~808ff0b03a79a48a:
  Delete: storage/bdb/test/dbscript.tcl
BitKeeper/deleted/.del-ddoyscript.tcl~a84d00bcc3e22889:
  Delete: storage/bdb/test/ddoyscript.tcl
BitKeeper/deleted/.del-ddscript.tcl~2fa930b65d65212b:
  Delete: storage/bdb/test/ddscript.tcl
BitKeeper/deleted/.del-dead001.tcl~b8ee6deab2cf41:
  Delete: storage/bdb/test/dead001.tcl
BitKeeper/deleted/.del-dead002.tcl~4ac413316f37d12:
  Delete: storage/bdb/test/dead002.tcl
BitKeeper/deleted/.del-dead003.tcl~ef79ddad4ad28e2:
  Delete: storage/bdb/test/dead003.tcl
BitKeeper/deleted/.del-dead004.tcl~45fb32cae919f872:
  Delete: storage/bdb/test/dead004.tcl
BitKeeper/deleted/.del-dead005.tcl~cb0208bc8e023367:
  Delete: storage/bdb/test/dead005.tcl
BitKeeper/deleted/.del-dead006.tcl~70e8875ef45eede8:
  Delete: storage/bdb/test/dead006.tcl
BitKeeper/deleted/.del-dead007.tcl~55aae8b9c7d421fa:
  Delete: storage/bdb/test/dead007.tcl
BitKeeper/deleted/.del-env001.tcl~99979288b7da80c8:
  Delete: storage/bdb/test/env001.tcl
BitKeeper/deleted/.del-env002.tcl~5debc4ae93c72d68:
  Delete: storage/bdb/test/env002.tcl
BitKeeper/deleted/.del-env003.tcl~121fcf8dc7778d34:
  Delete: storage/bdb/test/env003.tcl
BitKeeper/deleted/.del-env004.tcl~e7807309994bded4:
  Delete: storage/bdb/test/env004.tcl
BitKeeper/deleted/.del-env005.tcl~e4f000e9c61b43d1:
  Delete: storage/bdb/test/env005.tcl
BitKeeper/deleted/.del-env006.tcl~92493fc7761a9865:
  Delete: storage/bdb/test/env006.tcl
BitKeeper/deleted/.del-env007.tcl~2e6fab912f6358c0:
  Delete: storage/bdb/test/env007.tcl
BitKeeper/deleted/.del-env008.tcl~fd2df2fc17f08dc7:
  Delete: storage/bdb/test/env008.tcl
BitKeeper/deleted/.del-env009.tcl~98a210e96f4b00e0:
  Delete: storage/bdb/test/env009.tcl
BitKeeper/deleted/.del-env010.tcl~41352761470bb901:
  Delete: storage/bdb/test/env010.tcl
BitKeeper/deleted/.del-env011.tcl~76ceb885491bc871:
  Delete: storage/bdb/test/env011.tcl
BitKeeper/deleted/.del-hsearch.tcl~34a91568c7541aa:
  Delete: storage/bdb/test/hsearch.tcl
BitKeeper/deleted/.del-join.tcl~b503918cf9e496d1:
  Delete: storage/bdb/test/join.tcl
BitKeeper/deleted/.del-lock001.tcl~5e6ac15c660212c3:
  Delete: storage/bdb/test/lock001.tcl
BitKeeper/deleted/.del-lock002.tcl~ba8f9432fb2ac00d:
  Delete: storage/bdb/test/lock002.tcl
BitKeeper/deleted/.del-lock003.tcl~759cc2bf13380ab5:
  Delete: storage/bdb/test/lock003.tcl
BitKeeper/deleted/.del-lock004.tcl~9e51c2eba91943a0:
  Delete: storage/bdb/test/lock004.tcl
BitKeeper/deleted/.del-lock005.tcl~a7a6d094b22f85bb:
  Delete: storage/bdb/test/lock005.tcl
BitKeeper/deleted/.del-lockscript.tcl~a5adf8083780b5ab:
  Delete: storage/bdb/test/lockscript.tcl
BitKeeper/deleted/.del-log001.tcl~f7d62b195fc6d308:
  Delete: storage/bdb/test/log001.tcl
BitKeeper/deleted/.del-log002.tcl~c5acccda93ad2079:
  Delete: storage/bdb/test/log002.tcl
BitKeeper/deleted/.del-log003.tcl~5bf8d64f40a171c:
  Delete: storage/bdb/test/log003.tcl
BitKeeper/deleted/.del-log004.tcl~9bf0857249b0c080:
  Delete: storage/bdb/test/log004.tcl
BitKeeper/deleted/.del-log005.tcl~12b7ef7064a17ef3:
  Delete: storage/bdb/test/log005.tcl
BitKeeper/deleted/.del-logtrack.tcl~9197d7cf5d0bec52:
  Delete: storage/bdb/test/logtrack.tcl
BitKeeper/deleted/.del-mdbscript.tcl~fba3f049f17b2af6:
  Delete: storage/bdb/test/mdbscript.tcl
BitKeeper/deleted/.del-memp001.tcl~ab8f63cc9fcfb794:
  Delete: storage/bdb/test/memp001.tcl
BitKeeper/deleted/.del-memp002.tcl~e5d78e0b4e90ff48:
  Delete: storage/bdb/test/memp002.tcl
BitKeeper/deleted/.del-memp003.tcl~738862a9dcc682ab:
  Delete: storage/bdb/test/memp003.tcl
BitKeeper/deleted/.del-mpoolscript.tcl~27bfb81620657f4f:
  Delete: storage/bdb/test/mpoolscript.tcl
BitKeeper/deleted/.del-mutex001.tcl~3a27dee6ea8d5fff:
  Delete: storage/bdb/test/mutex001.tcl
BitKeeper/deleted/.del-mutex002.tcl~cc0f545c6977810e:
  Delete: storage/bdb/test/mutex002.tcl
BitKeeper/deleted/.del-mutex003.tcl~185695b35a871c24:
  Delete: storage/bdb/test/mutex003.tcl
BitKeeper/deleted/.del-mutexscript.tcl~127cfd6c6ba76bc:
  Delete: storage/bdb/test/mutexscript.tcl
BitKeeper/deleted/.del-ndbm.tcl~2335c936e466eb90:
  Delete: storage/bdb/test/ndbm.tcl
BitKeeper/deleted/.del-parallel.tcl~6b75752d884e583f:
  Delete: storage/bdb/test/parallel.tcl
BitKeeper/deleted/.del-recd001.tcl~955f092e1675447d:
  Delete: storage/bdb/test/recd001.tcl
BitKeeper/deleted/.del-recd002.tcl~64e6f3ed12e7f820:
  Delete: storage/bdb/test/recd002.tcl
BitKeeper/deleted/.del-recd003.tcl~d25a517848ce8210:
  Delete: storage/bdb/test/recd003.tcl
BitKeeper/deleted/.del-recd004.tcl~250f0c36f985a4f:
  Delete: storage/bdb/test/recd004.tcl
BitKeeper/deleted/.del-recd005.tcl~88455a0387834a98:
  Delete: storage/bdb/test/recd005.tcl
BitKeeper/deleted/.del-recd006.tcl~a2328b7fc111d419:
  Delete: storage/bdb/test/recd006.tcl
BitKeeper/deleted/.del-recd007.tcl~fe7a12aa6ba0702d:
  Delete: storage/bdb/test/recd007.tcl
BitKeeper/deleted/.del-recd008.tcl~48d3de82ee1646b0:
  Delete: storage/bdb/test/recd008.tcl
BitKeeper/deleted/.del-recd009.tcl~4595de558891dda1:
  Delete: storage/bdb/test/recd009.tcl
BitKeeper/deleted/.del-recd010.tcl~8d09d87ef031e743:
  Delete: storage/bdb/test/recd010.tcl
BitKeeper/deleted/.del-recd011.tcl~4926cb1abeacf65f:
  Delete: storage/bdb/test/recd011.tcl
BitKeeper/deleted/.del-recd012.tcl~192b59ff81537ca:
  Delete: storage/bdb/test/recd012.tcl
BitKeeper/deleted/.del-recd013.tcl~bf80f61e1bb44c96:
  Delete: storage/bdb/test/recd013.tcl
BitKeeper/deleted/.del-recd014.tcl~41b5f6072460f516:
  Delete: storage/bdb/test/recd014.tcl
BitKeeper/deleted/.del-recd015.tcl~b5c91e8098e824cf:
  Delete: storage/bdb/test/recd015.tcl
BitKeeper/deleted/.del-recd016.tcl~e4f063003eb7829c:
  Delete: storage/bdb/test/recd016.tcl
BitKeeper/deleted/.del-recd017.tcl~989c95e16c74a4f5:
  Delete: storage/bdb/test/recd017.tcl
BitKeeper/deleted/.del-recd018.tcl~bd67acd9e512019b:
  Delete: storage/bdb/test/recd018.tcl
BitKeeper/deleted/.del-recd019.tcl~1a3daef2f95097f3:
  Delete: storage/bdb/test/recd019.tcl
BitKeeper/deleted/.del-recd020.tcl~6ef83cca50c2fbf:
  Delete: storage/bdb/test/recd020.tcl
BitKeeper/deleted/.del-recd15scr.tcl~c8442ca1625aa1e6:
  Delete: storage/bdb/test/recd15scr.tcl
BitKeeper/deleted/.del-recdscript.tcl~30705cb242304a85:
  Delete: storage/bdb/test/recdscript.tcl
BitKeeper/deleted/.del-rep001.tcl~6639e63e9168016e:
  Delete: storage/bdb/test/rep001.tcl
BitKeeper/deleted/.del-rep002.tcl~59b5d22d6bb249a6:
  Delete: storage/bdb/test/rep002.tcl
BitKeeper/deleted/.del-rep003.tcl~d25a1ff77a550149:
  Delete: storage/bdb/test/rep003.tcl
BitKeeper/deleted/.del-rep004.tcl~f3c21fbb341c6b94:
  Delete: storage/bdb/test/rep004.tcl
BitKeeper/deleted/.del-rep005.tcl~1ad31ad578bfa51:
  Delete: storage/bdb/test/rep005.tcl
BitKeeper/deleted/.del-reputils.tcl~b9bcb01ffef525fb:
  Delete: storage/bdb/test/reputils.tcl
BitKeeper/deleted/.del-rpc001.tcl~88453ac2c774b942:
  Delete: storage/bdb/test/rpc001.tcl
BitKeeper/deleted/.del-rpc002.tcl~3d34fc9ac248ab8b:
  Delete: storage/bdb/test/rpc002.tcl
BitKeeper/deleted/.del-rpc003.tcl~5aba346f92bf16d:
  Delete: storage/bdb/test/rpc003.tcl
BitKeeper/deleted/.del-rpc004.tcl~163755dc13aec750:
  Delete: storage/bdb/test/rpc004.tcl
BitKeeper/deleted/.del-rpc005.tcl~36768d2d99f83f52:
  Delete: storage/bdb/test/rpc005.tcl
BitKeeper/deleted/.del-rsrc001.tcl~231d9f2ee3ace69:
  Delete: storage/bdb/test/rsrc001.tcl
BitKeeper/deleted/.del-rsrc002.tcl~3f58e3f58cb5c082:
  Delete: storage/bdb/test/rsrc002.tcl
BitKeeper/deleted/.del-rsrc003.tcl~cedc4847fcfc57bc:
  Delete: storage/bdb/test/rsrc003.tcl
BitKeeper/deleted/.del-rsrc004.tcl~823ee6b49ecae89b:
  Delete: storage/bdb/test/rsrc004.tcl
BitKeeper/deleted/.del-sdb001.tcl~e1107607ca761934:
  Delete: storage/bdb/test/sdb001.tcl
BitKeeper/deleted/.del-sdb002.tcl~964a21fbd96f8a22:
  Delete: storage/bdb/test/sdb002.tcl
BitKeeper/deleted/.del-sdb003.tcl~5e0bc4d6f3816226:
  Delete: storage/bdb/test/sdb003.tcl
BitKeeper/deleted/.del-sdb004.tcl~c327324b4768aed6:
  Delete: storage/bdb/test/sdb004.tcl
BitKeeper/deleted/.del-sdb005.tcl~db6122e3c3556632:
  Delete: storage/bdb/test/sdb005.tcl
BitKeeper/deleted/.del-sdb006.tcl~41b239316cafcac3:
  Delete: storage/bdb/test/sdb006.tcl
BitKeeper/deleted/.del-sdb007.tcl~5481a5a3b51ceeb2:
  Delete: storage/bdb/test/sdb007.tcl
BitKeeper/deleted/.del-sdb008.tcl~d75fbcdceb039bce:
  Delete: storage/bdb/test/sdb008.tcl
BitKeeper/deleted/.del-sdb009.tcl~d6859031f9bc14dc:
  Delete: storage/bdb/test/sdb009.tcl
BitKeeper/deleted/.del-sdb010.tcl~c256867b7db5c83b:
  Delete: storage/bdb/test/sdb010.tcl
BitKeeper/deleted/.del-sdb011.tcl~26a56c6b2749a162:
  Delete: storage/bdb/test/sdb011.tcl
BitKeeper/deleted/.del-sdb012.tcl~7f8955f99df6f9b5:
  Delete: storage/bdb/test/sdb012.tcl
BitKeeper/deleted/.del-sdbscript.tcl~cba1b6edd36654aa:
  Delete: storage/bdb/test/sdbscript.tcl
BitKeeper/deleted/.del-sdbtest001.tcl~f84b8a1c57eca170:
  Delete: storage/bdb/test/sdbtest001.tcl
BitKeeper/deleted/.del-sdbtest002.tcl~a924afa17f40eb2e:
  Delete: storage/bdb/test/sdbtest002.tcl
BitKeeper/deleted/.del-sdbutils.tcl~2805b251c9b76de3:
  Delete: storage/bdb/test/sdbutils.tcl
BitKeeper/deleted/.del-sec001.tcl~c82cbc2e241aa3f1:
  Delete: storage/bdb/test/sec001.tcl
BitKeeper/deleted/.del-sec002.tcl~9679d7e13b4c6ede:
  Delete: storage/bdb/test/sec002.tcl
BitKeeper/deleted/.del-shelltest.tcl~4b16ad64f199e26c:
  Delete: storage/bdb/test/shelltest.tcl
BitKeeper/deleted/.del-si001.tcl~75838f939815111a:
  Delete: storage/bdb/test/si001.tcl
BitKeeper/deleted/.del-si002.tcl~e8510b09b71e3f5:
  Delete: storage/bdb/test/si002.tcl
BitKeeper/deleted/.del-si003.tcl~aa00a31d48f38b81:
  Delete: storage/bdb/test/si003.tcl
BitKeeper/deleted/.del-si004.tcl~78eb6f226e9f34f4:
  Delete: storage/bdb/test/si004.tcl
BitKeeper/deleted/.del-si005.tcl~cab54cae8e9931d:
  Delete: storage/bdb/test/si005.tcl
BitKeeper/deleted/.del-si006.tcl~eff36e7e40ec3b4b:
  Delete: storage/bdb/test/si006.tcl
BitKeeper/deleted/.del-sindex.tcl~a1d08b36703dea6:
  Delete: storage/bdb/test/sindex.tcl
BitKeeper/deleted/.del-sysscript.tcl~1e15f1c5ff8c1f22:
  Delete: storage/bdb/test/sysscript.tcl
BitKeeper/deleted/.del-test.tcl~992e553a9b90e6bf:
  Delete: storage/bdb/test/test.tcl
BitKeeper/deleted/.del-test001.tcl~7c497849d5cc47e:
  Delete: storage/bdb/test/test001.tcl
BitKeeper/deleted/.del-test002.tcl~f62bf602371682f5:
  Delete: storage/bdb/test/test002.tcl
BitKeeper/deleted/.del-test003.tcl~2c056a0eb88120c7:
  Delete: storage/bdb/test/test003.tcl
BitKeeper/deleted/.del-test004.tcl~e74e086eed01b24f:
  Delete: storage/bdb/test/test004.tcl
BitKeeper/deleted/.del-test005.tcl~b663af0e3f63cc12:
  Delete: storage/bdb/test/test005.tcl
BitKeeper/deleted/.del-test006.tcl~7ef19ccd6c6981f2:
  Delete: storage/bdb/test/test006.tcl
BitKeeper/deleted/.del-test007.tcl~708cd48497e87fad:
  Delete: storage/bdb/test/test007.tcl
BitKeeper/deleted/.del-test008.tcl~b8aed254d8bffc6e:
  Delete: storage/bdb/test/test008.tcl
BitKeeper/deleted/.del-test009.tcl~8258b689eb65d10a:
  Delete: storage/bdb/test/test009.tcl
BitKeeper/deleted/.del-test010.tcl~a8916240242cdac0:
  Delete: storage/bdb/test/test010.tcl
BitKeeper/deleted/.del-test011.tcl~49d813ea130c63c:
  Delete: storage/bdb/test/test011.tcl
BitKeeper/deleted/.del-test012.tcl~3f9d19119ee4c1a6:
  Delete: storage/bdb/test/test012.tcl
BitKeeper/deleted/.del-test013.tcl~fc95c9707c0c9408:
  Delete: storage/bdb/test/test013.tcl
BitKeeper/deleted/.del-test014.tcl~1773e8eceb4d9e05:
  Delete: storage/bdb/test/test014.tcl
BitKeeper/deleted/.del-test015.tcl~444573fe985a9dcf:
  Delete: storage/bdb/test/test015.tcl
BitKeeper/deleted/.del-test016.tcl~36ba7ce481334a6:
  Delete: storage/bdb/test/test016.tcl
BitKeeper/deleted/.del-test017.tcl~6e285070a55a47e1:
  Delete: storage/bdb/test/test017.tcl
BitKeeper/deleted/.del-test018.tcl~b9dc3eb96babaa6b:
  Delete: storage/bdb/test/test018.tcl
BitKeeper/deleted/.del-test019.tcl~589eb8c837a35f69:
  Delete: storage/bdb/test/test019.tcl
BitKeeper/deleted/.del-test020.tcl~492031a3803d0ec9:
  Delete: storage/bdb/test/test020.tcl
BitKeeper/deleted/.del-test021.tcl~a806bd0727c6d6a4:
  Delete: storage/bdb/test/test021.tcl
BitKeeper/deleted/.del-test022.tcl~6010069b5dc180c0:
  Delete: storage/bdb/test/test022.tcl
BitKeeper/deleted/.del-test023.tcl~abe3e5ec804485c0:
  Delete: storage/bdb/test/test023.tcl
BitKeeper/deleted/.del-test024.tcl~76c31e5db529695c:
  Delete: storage/bdb/test/test024.tcl
BitKeeper/deleted/.del-test025.tcl~3514c2e3ab50d597:
  Delete: storage/bdb/test/test025.tcl
BitKeeper/deleted/.del-test026.tcl~e078236ba1044355:
  Delete: storage/bdb/test/test026.tcl
BitKeeper/deleted/.del-test027.tcl~ffa13609f8f0ffdb:
  Delete: storage/bdb/test/test027.tcl
BitKeeper/deleted/.del-test028.tcl~b235714f33c6ccb:
  Delete: storage/bdb/test/test028.tcl
BitKeeper/deleted/.del-test029.tcl~998729678d5b6299:
  Delete: storage/bdb/test/test029.tcl
BitKeeper/deleted/.del-test030.tcl~8fbed7506ae5f5ae:
  Delete: storage/bdb/test/test030.tcl
BitKeeper/deleted/.del-test031.tcl~4670fab63b50d57f:
  Delete: storage/bdb/test/test031.tcl
BitKeeper/deleted/.del-test032.tcl~3d301e8996def9da:
  Delete: storage/bdb/test/test032.tcl
BitKeeper/deleted/.del-test033.tcl~8fef4678e3dfdc1a:
  Delete: storage/bdb/test/test033.tcl
BitKeeper/deleted/.del-test034.tcl~6f4fc46225bdddb6:
  Delete: storage/bdb/test/test034.tcl
BitKeeper/deleted/.del-test035.tcl~ee79f3198de4a6c3:
  Delete: storage/bdb/test/test035.tcl
BitKeeper/deleted/.del-test036.tcl~70c97aa8199ce2b2:
  Delete: storage/bdb/test/test036.tcl
BitKeeper/deleted/.del-test037.tcl~84a15153bf328893:
  Delete: storage/bdb/test/test037.tcl
BitKeeper/deleted/.del-test038.tcl~4b86951797326fb6:
  Delete: storage/bdb/test/test038.tcl
BitKeeper/deleted/.del-test039.tcl~bbe64cdcbf284055:
  Delete: storage/bdb/test/test039.tcl
BitKeeper/deleted/.del-test040.tcl~186087bc93037dc8:
  Delete: storage/bdb/test/test040.tcl
BitKeeper/deleted/.del-test041.tcl~58dd11454418f1df:
  Delete: storage/bdb/test/test041.tcl
BitKeeper/deleted/.del-test042.tcl~e3abc60a16e18ea7:
  Delete: storage/bdb/test/test042.tcl
BitKeeper/deleted/.del-test043.tcl~2d276374e36cc44e:
  Delete: storage/bdb/test/test043.tcl
BitKeeper/deleted/.del-test044.tcl~edf4ad84a76362fa:
  Delete: storage/bdb/test/test044.tcl
BitKeeper/deleted/.del-test045.tcl~e03bd4ebab641805:
  Delete: storage/bdb/test/test045.tcl
BitKeeper/deleted/.del-test046.tcl~b37133329df2b0d6:
  Delete: storage/bdb/test/test046.tcl
BitKeeper/deleted/.del-test047.tcl~2d3f2b721d637b6a:
  Delete: storage/bdb/test/test047.tcl
BitKeeper/deleted/.del-test048.tcl~1ac7bb441bd5bdb6:
  Delete: storage/bdb/test/test048.tcl
BitKeeper/deleted/.del-test049.tcl~e158663325c08d2c:
  Delete: storage/bdb/test/test049.tcl
BitKeeper/deleted/.del-test050.tcl~f3703b59466a8502:
  Delete: storage/bdb/test/test050.tcl
BitKeeper/deleted/.del-test051.tcl~7799ccc410e40530:
  Delete: storage/bdb/test/test051.tcl
BitKeeper/deleted/.del-test052.tcl~238c71b3c044d73d:
  Delete: storage/bdb/test/test052.tcl
BitKeeper/deleted/.del-test053.tcl~c28e0d69cb1bb6bf:
  Delete: storage/bdb/test/test053.tcl
BitKeeper/deleted/.del-test054.tcl~f182b2517dfecc42:
  Delete: storage/bdb/test/test054.tcl
BitKeeper/deleted/.del-test055.tcl~e40f096f58000daa:
  Delete: storage/bdb/test/test055.tcl
BitKeeper/deleted/.del-test056.tcl~61f364b68fd25228:
  Delete: storage/bdb/test/test056.tcl
BitKeeper/deleted/.del-test057.tcl~abd7b4edceb7f3d8:
  Delete: storage/bdb/test/test057.tcl
BitKeeper/deleted/.del-test058.tcl~8a02c0ea44840334:
  Delete: storage/bdb/test/test058.tcl
BitKeeper/deleted/.del-test059.tcl~a3b61d65c0684efd:
  Delete: storage/bdb/test/test059.tcl
BitKeeper/deleted/.del-test060.tcl~2ba894fe978960c2:
  Delete: storage/bdb/test/test060.tcl
BitKeeper/deleted/.del-test061.tcl~eaf129c2ccbc3f5c:
  Delete: storage/bdb/test/test061.tcl
BitKeeper/deleted/.del-test062.tcl~53f36156b352c123:
  Delete: storage/bdb/test/test062.tcl
BitKeeper/deleted/.del-test063.tcl~b0413d6a47dd7713:
  Delete: storage/bdb/test/test063.tcl
BitKeeper/deleted/.del-test064.tcl~8c8d79643c127a4:
  Delete: storage/bdb/test/test064.tcl
BitKeeper/deleted/.del-test065.tcl~44d82ad263c529ea:
  Delete: storage/bdb/test/test065.tcl
BitKeeper/deleted/.del-test066.tcl~ad0ca187291e5923:
  Delete: storage/bdb/test/test066.tcl
BitKeeper/deleted/.del-test067.tcl~4da80670cae6f271:
  Delete: storage/bdb/test/test067.tcl
BitKeeper/deleted/.del-test068.tcl~a56db5bdaa6097fd:
  Delete: storage/bdb/test/test068.tcl
BitKeeper/deleted/.del-test069.tcl~a39feaa4f4b037c9:
  Delete: storage/bdb/test/test069.tcl
BitKeeper/deleted/.del-test070.tcl~35559617bc69dbdb:
  Delete: storage/bdb/test/test070.tcl
BitKeeper/deleted/.del-test071.tcl~6af93fa1c1ac179c:
  Delete: storage/bdb/test/test071.tcl
BitKeeper/deleted/.del-test072.tcl~e1630e29183f75b5:
  Delete: storage/bdb/test/test072.tcl
BitKeeper/deleted/.del-test073.tcl~dbb57c71d31a93e8:
  Delete: storage/bdb/test/test073.tcl
BitKeeper/deleted/.del-test074.tcl~9b36a93ed679ec3b:
  Delete: storage/bdb/test/test074.tcl
BitKeeper/deleted/.del-test075.tcl~55f0e90e9948697:
  Delete: storage/bdb/test/test075.tcl
BitKeeper/deleted/.del-test076.tcl~5ec9f2c249cd7d6c:
  Delete: storage/bdb/test/test076.tcl
BitKeeper/deleted/.del-test077.tcl~920463fe1710f362:
  Delete: storage/bdb/test/test077.tcl
BitKeeper/deleted/.del-test078.tcl~e968797716541059:
  Delete: storage/bdb/test/test078.tcl
BitKeeper/deleted/.del-test079.tcl~dab9573083074ebd:
  Delete: storage/bdb/test/test079.tcl
BitKeeper/deleted/.del-test080.tcl~fdeda1207812183a:
  Delete: storage/bdb/test/test080.tcl
BitKeeper/deleted/.del-test081.tcl~965a56e3a45b064e:
  Delete: storage/bdb/test/test081.tcl
BitKeeper/deleted/.del-test082.tcl~9e31d460450e1eca:
  Delete: storage/bdb/test/test082.tcl
BitKeeper/deleted/.del-test083.tcl~14a579863e09cadc:
  Delete: storage/bdb/test/test083.tcl
BitKeeper/deleted/.del-test084.tcl~b4ef1538a604bfb2:
  Delete: storage/bdb/test/test084.tcl
BitKeeper/deleted/.del-test085.tcl~49a7f28eb2f8d1c1:
  Delete: storage/bdb/test/test085.tcl
BitKeeper/deleted/.del-test086.tcl~6a011092ed6492ab:
  Delete: storage/bdb/test/test086.tcl
BitKeeper/deleted/.del-test087.tcl~67ffc668cffee04c:
  Delete: storage/bdb/test/test087.tcl
BitKeeper/deleted/.del-test088.tcl~189537e912432d04:
  Delete: storage/bdb/test/test088.tcl
BitKeeper/deleted/.del-test089.tcl~4d777a6fab77ee5f:
  Delete: storage/bdb/test/test089.tcl
BitKeeper/deleted/.del-test090.tcl~df90cf443e7fd392:
  Delete: storage/bdb/test/test090.tcl
BitKeeper/deleted/.del-test091.tcl~7b3a2c8871cf0b93:
  Delete: storage/bdb/test/test091.tcl
BitKeeper/deleted/.del-test092.tcl~1ca87063b7aae056:
  Delete: storage/bdb/test/test092.tcl
BitKeeper/deleted/.del-test093.tcl~58abaa0e370f696d:
  Delete: storage/bdb/test/test093.tcl
BitKeeper/deleted/.del-test094.tcl~ac0a4b615a6be00d:
  Delete: storage/bdb/test/test094.tcl
BitKeeper/deleted/.del-test095.tcl~65633e864e895773:
  Delete: storage/bdb/test/test095.tcl
BitKeeper/deleted/.del-test096.tcl~a4259e5794261692:
  Delete: storage/bdb/test/test096.tcl
BitKeeper/deleted/.del-test097.tcl~59915885eff391d9:
  Delete: storage/bdb/test/test097.tcl
BitKeeper/deleted/.del-test098.tcl~421438a23fdc8da1:
  Delete: storage/bdb/test/test098.tcl
BitKeeper/deleted/.del-test099.tcl~ecb60f71caa0104e:
  Delete: storage/bdb/test/test099.tcl
BitKeeper/deleted/.del-test100.tcl~cbf3c2ab49a445:
  Delete: storage/bdb/test/test100.tcl
BitKeeper/deleted/.del-test101.tcl~2a7ed4a3bb8a48a3:
  Delete: storage/bdb/test/test101.tcl
BitKeeper/deleted/.del-testparams.tcl~1b39050ecb624442:
  Delete: storage/bdb/test/testparams.tcl
BitKeeper/deleted/.del-testutils.tcl~9e77f5853c538eaf:
  Delete: storage/bdb/test/testutils.tcl
BitKeeper/deleted/.del-txn001.tcl~affc012a3da3cc8a:
  Delete: storage/bdb/test/txn001.tcl
BitKeeper/deleted/.del-txn002.tcl~42f2b0fa86e4a807:
  Delete: storage/bdb/test/txn002.tcl
BitKeeper/deleted/.del-txn003.tcl~41bd535632d28944:
  Delete: storage/bdb/test/txn003.tcl
BitKeeper/deleted/.del-txn004.tcl~36e409a3c47a6380:
  Delete: storage/bdb/test/txn004.tcl
BitKeeper/deleted/.del-txn005.tcl~c7c258c01a825f9f:
  Delete: storage/bdb/test/txn005.tcl
BitKeeper/deleted/.del-txn006.tcl~33fb6688c9cb2394:
  Delete: storage/bdb/test/txn006.tcl
BitKeeper/deleted/.del-txn007.tcl~1e55f1c1b493abb3:
  Delete: storage/bdb/test/txn007.tcl
BitKeeper/deleted/.del-txn008.tcl~8d3b828ad12cda69:
  Delete: storage/bdb/test/txn008.tcl
BitKeeper/deleted/.del-txn009.tcl~c57ad8934bc8cc8b:
  Delete: storage/bdb/test/txn009.tcl
BitKeeper/deleted/.del-txnscript.tcl~fea6f1c6aa45aa4:
  Delete: storage/bdb/test/txnscript.tcl
BitKeeper/deleted/.del-update.tcl~eb74470da58e545a:
  Delete: storage/bdb/test/update.tcl
BitKeeper/deleted/.del-upgrade.tcl~9aeaf897775dec6e:
  Delete: storage/bdb/test/upgrade.tcl
BitKeeper/deleted/.del-wordlist~153352d7533f7f60:
  Delete: storage/bdb/test/wordlist
BitKeeper/deleted/.del-wrap.tcl~89400388e5b234c2:
  Delete: storage/bdb/test/wrap.tcl
BitKeeper/deleted/.del-chk.code~4c8908261a6053fd:
  Delete: storage/bdb/test/scr001/chk.code
BitKeeper/deleted/.del-chk.def~c9d08d27a526d44b:
  Delete: storage/bdb/test/scr002/chk.def
BitKeeper/deleted/.del-chk.define~2a0fb00fc4ed968e:
  Delete: storage/bdb/test/scr003/chk.define
BitKeeper/deleted/.del-chk.javafiles~9e3dd374dfb0aa3a:
  Delete: storage/bdb/test/scr004/chk.javafiles
BitKeeper/deleted/.del-chk.nl~70b4e5b798c753ed:
  Delete: storage/bdb/test/scr005/chk.nl
BitKeeper/deleted/.del-chk.offt~8a3c305110b12735:
  Delete: storage/bdb/test/scr006/chk.offt
BitKeeper/deleted/.del-chk.proto~d1923cdd90414e56:
  Delete: storage/bdb/test/scr007/chk.proto
BitKeeper/deleted/.del-chk.pubdef~bd699d2321166d30:
  Delete: storage/bdb/test/scr008/chk.pubdef
BitKeeper/deleted/.del-chk.srcfiles~d4d837e36a9ba9f1:
  Delete: storage/bdb/test/scr009/chk.srcfiles
BitKeeper/deleted/.del-chk.str~cb7fd8a4f2a1fad1:
  Delete: storage/bdb/test/scr010/chk.str
BitKeeper/deleted/.del-spell.ok~5d9d5e442e5ebf62:
  Delete: storage/bdb/test/scr010/spell.ok
BitKeeper/deleted/.del-chk.tags~8ee11b591e1a18fe:
  Delete: storage/bdb/test/scr011/chk.tags
BitKeeper/deleted/.del-chk.stats~38fd26c0ece7131d:
  Delete: storage/bdb/test/scr013/chk.stats
BitKeeper/deleted/.del-chk.vx_code~ec114356750bc985:
  Delete: storage/bdb/test/scr012/chk.vx_code
BitKeeper/deleted/.del-chk.err~ca4595c9dbc93f1b:
  Delete: storage/bdb/test/scr014/chk.err
BitKeeper/deleted/.del-README~29417fd1ec6b2679:
  Delete: storage/bdb/test/scr015/README
BitKeeper/deleted/.del-TestConstruct01.cpp~425c78577f8f28c8:
  Delete: storage/bdb/test/scr015/TestConstruct01.cpp
BitKeeper/deleted/.del-TestConstruct01.testerr~6e4e36b2dc63c283:
  Delete: storage/bdb/test/scr015/TestConstruct01.testerr
BitKeeper/deleted/.del-TestConstruct01.testout~5e8776554283a4c4:
  Delete: storage/bdb/test/scr015/TestConstruct01.testout
BitKeeper/deleted/.del-TestExceptInclude.cpp~67d314a055e90bf3:
  Delete: storage/bdb/test/scr015/TestExceptInclude.cpp
BitKeeper/deleted/.del-TestGetSetMethods.cpp~ce02cae6e67225d:
  Delete: storage/bdb/test/scr015/TestGetSetMethods.cpp
BitKeeper/deleted/.del-TestKeyRange.cpp~9b80f48a5174a5c9:
  Delete: storage/bdb/test/scr015/TestKeyRange.cpp
BitKeeper/deleted/.del-TestKeyRange.testin~67ca6fe17815d21b:
  Delete: storage/bdb/test/scr015/TestKeyRange.testin
BitKeeper/deleted/.del-TestKeyRange.testout~5bcbbf21d18eff:
  Delete: storage/bdb/test/scr015/TestKeyRange.testout
BitKeeper/deleted/.del-TestLogc.cpp~bad0027b7264e53e:
  Delete: storage/bdb/test/scr015/TestLogc.cpp
BitKeeper/deleted/.del-TestLogc.testout~a4609b75a4779f43:
  Delete: storage/bdb/test/scr015/TestLogc.testout
BitKeeper/deleted/.del-TestSimpleAccess.cpp~bd7c1d1d12b641d:
  Delete: storage/bdb/test/scr015/TestSimpleAccess.cpp
BitKeeper/deleted/.del-TestSimpleAccess.testout~5efeed9c81b9bc27:
  Delete: storage/bdb/test/scr015/TestSimpleAccess.testout
BitKeeper/deleted/.del-TestTruncate.cpp~25ed0d942f0a5369:
  Delete: storage/bdb/test/scr015/TestTruncate.cpp
BitKeeper/deleted/.del-TestTruncate.testout~ccbc326c37208fa9:
  Delete: storage/bdb/test/scr015/TestTruncate.testout
BitKeeper/deleted/.del-chk.cxxtests~c40a22d26ccf756a:
  Delete: storage/bdb/test/scr015/chk.cxxtests
BitKeeper/deleted/.del-ignore~a29a88595efdfb44:
  Delete: storage/bdb/test/scr015/ignore
BitKeeper/deleted/.del-testall~a38a540fd662e4b:
  Delete: storage/bdb/test/scr015/testall
BitKeeper/deleted/.del-testone~2611e5ac141df9e:
  Delete: storage/bdb/test/scr015/testone
BitKeeper/deleted/.del-CallbackTest.java~cbfa27249d061cfb:
  Delete: storage/bdb/test/scr016/CallbackTest.java
BitKeeper/deleted/.del-CallbackTest.testout~71e902a33379ba52:
  Delete: storage/bdb/test/scr016/CallbackTest.testout
BitKeeper/deleted/.del-README~c0e58cbcc5c57ddc:
  Delete: storage/bdb/test/scr016/README
BitKeeper/deleted/.del-TestAppendRecno.java~8ad6fa89c4cff7cd:
  Delete: storage/bdb/test/scr016/TestAppendRecno.java
BitKeeper/deleted/.del-TestAppendRecno.testout~43c535efe914c498:
  Delete: storage/bdb/test/scr016/TestAppendRecno.testout
BitKeeper/deleted/.del-TestAssociate.java~cd029537c3af5252:
  Delete: storage/bdb/test/scr016/TestAssociate.java
BitKeeper/deleted/.del-TestAssociate.testout~261a98eaac389069:
  Delete: storage/bdb/test/scr016/TestAssociate.testout
BitKeeper/deleted/.del-TestClosedDb.java~6f99db2fb2fa2d15:
  Delete: storage/bdb/test/scr016/TestClosedDb.java
BitKeeper/deleted/.del-TestClosedDb.testout~46a360b011d96925:
  Delete: storage/bdb/test/scr016/TestClosedDb.testout
BitKeeper/deleted/.del-TestConstruct01.java~8b68df1abcf4843:
  Delete: storage/bdb/test/scr016/TestConstruct01.java
BitKeeper/deleted/.del-TestConstruct01.testerr~8be3723f205f31dd:
  Delete: storage/bdb/test/scr016/TestConstruct01.testerr
BitKeeper/deleted/.del-TestConstruct01.testout~59baf46019af0f93:
  Delete: storage/bdb/test/scr016/TestConstruct01.testout
BitKeeper/deleted/.del-TestConstruct02.java~7629249c946fe58f:
  Delete: storage/bdb/test/scr016/TestConstruct02.java
BitKeeper/deleted/.del-TestConstruct02.testout~129a58ccfb4f9868:
  Delete: storage/bdb/test/scr016/TestConstruct02.testout
BitKeeper/deleted/.del-TestDbtFlags.java~6da39a3c264c5e1:
  Delete: storage/bdb/test/scr016/TestDbtFlags.java
BitKeeper/deleted/.del-TestDbtFlags.testerr~bf1b8223db949631:
  Delete: storage/bdb/test/scr016/TestDbtFlags.testerr
BitKeeper/deleted/.del-TestDbtFlags.testout~a104075868b55448:
  Delete: storage/bdb/test/scr016/TestDbtFlags.testout
BitKeeper/deleted/.del-TestGetSetMethods.java~ce458701b96fbae5:
  Delete: storage/bdb/test/scr016/TestGetSetMethods.java
BitKeeper/deleted/.del-TestKeyRange.java~bbedf620a38ba528:
  Delete: storage/bdb/test/scr016/TestKeyRange.java
BitKeeper/deleted/.del-TestKeyRange.testout~bea8cd86cb028218:
  Delete: storage/bdb/test/scr016/TestKeyRange.testout
BitKeeper/deleted/.del-TestLockVec.java~f2a881f24fcd0a3d:
  Delete: storage/bdb/test/scr016/TestLockVec.java
BitKeeper/deleted/.del-TestLockVec.testout~100308b4d8ffe94d:
  Delete: storage/bdb/test/scr016/TestLockVec.testout
BitKeeper/deleted/.del-TestLogc.java~73a824d2d67a26d:
  Delete: storage/bdb/test/scr016/TestLogc.java
BitKeeper/deleted/.del-TestLogc.testout~b3a920723db1fdaf:
  Delete: storage/bdb/test/scr016/TestLogc.testout
BitKeeper/deleted/.del-TestOpenEmpty.java~ca2c539e136b83f4:
  Delete: storage/bdb/test/scr016/TestOpenEmpty.java
BitKeeper/deleted/.del-TestOpenEmpty.testerr~94241960bab03730:
  Delete: storage/bdb/test/scr016/TestOpenEmpty.testerr
BitKeeper/deleted/.del-TestReplication.java~2007f084cfd99774:
  Delete: storage/bdb/test/scr016/TestReplication.java
BitKeeper/deleted/.del-TestRpcServer.java~136338ae7114729e:
  Delete: storage/bdb/test/scr016/TestRpcServer.java
BitKeeper/deleted/.del-TestSameDbt.java~6b58f6d4667df271:
  Delete: storage/bdb/test/scr016/TestSameDbt.java
BitKeeper/deleted/.del-TestSameDbt.testout~32315254d8be8d41:
  Delete: storage/bdb/test/scr016/TestSameDbt.testout
BitKeeper/deleted/.del-TestSimpleAccess.java~9d44ee26d00dabcf:
  Delete: storage/bdb/test/scr016/TestSimpleAccess.java
BitKeeper/deleted/.del-TestSimpleAccess.testout~c93b176ca5d121fa:
  Delete: storage/bdb/test/scr016/TestSimpleAccess.testout
BitKeeper/deleted/.del-TestStat.java~b3254049c84f2e89:
  Delete: storage/bdb/test/scr016/TestStat.java
BitKeeper/deleted/.del-TestStat.testout~59276cedffc035:
  Delete: storage/bdb/test/scr016/TestStat.testout
BitKeeper/deleted/.del-TestTruncate.java~5ffd51efb9a0f54c:
  Delete: storage/bdb/test/scr016/TestTruncate.java
BitKeeper/deleted/.del-TestTruncate.testout~1078a6e877e3e063:
  Delete: storage/bdb/test/scr016/TestTruncate.testout
BitKeeper/deleted/.del-TestUtil.java~52eef127e5085616:
  Delete: storage/bdb/test/scr016/TestUtil.java
BitKeeper/deleted/.del-TestXAServlet.java~aa3f0d373e0305dc:
  Delete: storage/bdb/test/scr016/TestXAServlet.java
BitKeeper/deleted/.del-chk.javatests~76196d06146273e8:
  Delete: storage/bdb/test/scr016/chk.javatests
BitKeeper/deleted/.del-ignore~2d9ec9d6d8c49ffe:
  Delete: storage/bdb/test/scr016/ignore
BitKeeper/deleted/.del-testall~eba2218c5e16bb31:
  Delete: storage/bdb/test/scr016/testall
BitKeeper/deleted/.del-testone~79a7cbbc69ecdfe1:
  Delete: storage/bdb/test/scr016/testone
BitKeeper/deleted/.del-O.BH~84b85479f477037b:
  Delete: storage/bdb/test/scr017/O.BH
BitKeeper/deleted/.del-O.R~efc67c567acd7ee8:
  Delete: storage/bdb/test/scr017/O.R
BitKeeper/deleted/.del-chk.db185~13e5ae02d2f2952f:
  Delete: storage/bdb/test/scr017/chk.db185
BitKeeper/deleted/.del-t.c~b59e28ce10263d8b:
  Delete: storage/bdb/test/scr017/t.c
BitKeeper/deleted/.del-chk.comma~f4c73d979215e8d9:
  Delete: storage/bdb/test/scr018/chk.comma
BitKeeper/deleted/.del-t.c~4c80ca5b22f28809:
  Delete: storage/bdb/test/scr018/t.c
BitKeeper/deleted/.del-chk.include~6ccbc39213db1cfc:
  Delete: storage/bdb/test/scr019/chk.include
BitKeeper/deleted/.del-chk.flags~d3427093f84cf9cb:
  Delete: storage/bdb/test/scr021/chk.flags
BitKeeper/deleted/.del-chk.inc~4411d703b39a2d46:
  Delete: storage/bdb/test/scr020/chk.inc
BitKeeper/deleted/.del-chk.rr~f562abf3c6627d13:
  Delete: storage/bdb/test/scr022/chk.rr
BitKeeper/etc/ignore:
  Update ignore list for bdb
storage/bdb/LICENSE:
  Import new version
storage/bdb/btree/bt_compare.c:
  Import new version
storage/bdb/btree/bt_conv.c:
  Import new version
storage/bdb/btree/bt_curadj.c:
  Import new version
storage/bdb/btree/bt_cursor.c:
  Import new version
storage/bdb/btree/bt_delete.c:
  Import new version
storage/bdb/btree/bt_method.c:
  Import new version
storage/bdb/btree/bt_open.c:
  Import new version
storage/bdb/btree/bt_put.c:
  Import new version
storage/bdb/btree/bt_rec.c:
  Import new version
storage/bdb/btree/bt_reclaim.c:
  Import new version
storage/bdb/btree/bt_recno.c:
  Import new version
storage/bdb/btree/bt_rsearch.c:
  Import new version
storage/bdb/btree/bt_search.c:
  Import new version
storage/bdb/btree/bt_split.c:
  Import new version
storage/bdb/btree/bt_stat.c:
  Import new version
storage/bdb/btree/bt_upgrade.c:
  Import new version
storage/bdb/btree/bt_verify.c:
  Import new version
storage/bdb/btree/btree.src:
  Import new version
storage/bdb/build_win32/Berkeley_DB.dsw:
  Import new version
storage/bdb/build_win32/app_dsp.src:
  Import new version
storage/bdb/build_win32/dbkill.cpp:
  Import new version
storage/bdb/build_win32/dynamic_dsp.src:
  Import new version
storage/bdb/build_win32/libdb_tcl.def:
  Import new version
storage/bdb/build_win32/libdbrc.src:
  Import new version
storage/bdb/build_win32/static_dsp.src:
  Import new version
storage/bdb/clib/getcwd.c:
  Import new version
storage/bdb/clib/getopt.c:
  Import new version
storage/bdb/clib/memcmp.c:
  Import new version
storage/bdb/clib/memmove.c:
  Import new version
storage/bdb/clib/raise.c:
  Import new version
storage/bdb/clib/snprintf.c:
  Import new version
storage/bdb/clib/strcasecmp.c:
  Import new version
storage/bdb/clib/strdup.c:
  Import new version
storage/bdb/clib/strerror.c:
  Import new version
storage/bdb/clib/strtol.c:
  Import new version
storage/bdb/clib/strtoul.c:
  Import new version
storage/bdb/common/crypto_stub.c:
  Import new version
storage/bdb/common/db_byteorder.c:
  Import new version
storage/bdb/common/db_err.c:
  Import new version
storage/bdb/common/db_getlong.c:
  Import new version
storage/bdb/common/db_idspace.c:
  Import new version
storage/bdb/common/db_log2.c:
  Import new version
storage/bdb/common/util_arg.c:
  Import new version
storage/bdb/common/util_cache.c:
  Import new version
storage/bdb/common/util_log.c:
  Import new version
storage/bdb/common/util_sig.c:
  Import new version
storage/bdb/crypto/aes_method.c:
  Import new version
storage/bdb/crypto/crypto.c:
  Import new version
storage/bdb/crypto/crypto.html:
  Import new version
storage/bdb/crypto/mersenne/mt19937db.c:
  Import new version
storage/bdb/crypto/rijndael/rijndael-alg-fst.h:
  Import new version
storage/bdb/crypto/rijndael/rijndael-api-fst.h:
  Import new version
storage/bdb/cxx/cxx_db.cpp:
  Import new version
storage/bdb/cxx/cxx_dbc.cpp:
  Import new version
storage/bdb/cxx/cxx_dbt.cpp:
  Import new version
storage/bdb/cxx/cxx_env.cpp:
  Import new version
storage/bdb/cxx/cxx_except.cpp:
  Import new version
storage/bdb/cxx/cxx_lock.cpp:
  Import new version
storage/bdb/cxx/cxx_logc.cpp:
  Import new version
storage/bdb/cxx/cxx_mpool.cpp:
  Import new version
storage/bdb/cxx/cxx_multi.cpp:
  Import new version
storage/bdb/cxx/cxx_seq.cpp:
  Import new version
storage/bdb/cxx/cxx_txn.cpp:
  Import new version
storage/bdb/db/crdel.src:
  Import new version
storage/bdb/db/crdel_rec.c:
  Import new version
storage/bdb/db/db.c:
  Import new version
storage/bdb/db/db.src:
  Import new version
storage/bdb/db/db_am.c:
  Import new version
storage/bdb/db/db_cam.c:
  Import new version
storage/bdb/db/db_conv.c:
  Import new version
storage/bdb/db/db_dispatch.c:
  Import new version
storage/bdb/db/db_dup.c:
  Import new version
storage/bdb/db/db_iface.c:
  Import new version
storage/bdb/db/db_join.c:
  Import new version
storage/bdb/db/db_meta.c:
  Import new version
storage/bdb/db/db_method.c:
  Import new version
storage/bdb/db/db_open.c:
  Import new version
storage/bdb/db/db_overflow.c:
  Import new version
storage/bdb/db/db_ovfl_vrfy.c:
  Import new version
storage/bdb/db/db_pr.c:
  Import new version
storage/bdb/db/db_rec.c:
  Import new version
storage/bdb/db/db_reclaim.c:
  Import new version
storage/bdb/db/db_remove.c:
  Import new version
storage/bdb/db/db_rename.c:
  Import new version
storage/bdb/db/db_ret.c:
  Import new version
storage/bdb/db/db_setid.c:
  Import new version
storage/bdb/db/db_setlsn.c:
  Import new version
storage/bdb/db/db_stati.c:
  Import new version
storage/bdb/db/db_truncate.c:
  Import new version
storage/bdb/db/db_upg.c:
  Import new version
storage/bdb/db/db_upg_opd.c:
  Import new version
storage/bdb/db/db_vrfy.c:
  Import new version
storage/bdb/db/db_vrfy_stub.c:
  Import new version
storage/bdb/db/db_vrfyutil.c:
  Import new version
storage/bdb/db185/db185.c:
  Import new version
storage/bdb/db185/db185_int.in:
  Import new version
storage/bdb/db_archive/db_archive.c:
  Import new version
storage/bdb/db_checkpoint/db_checkpoint.c:
  Import new version
storage/bdb/db_deadlock/db_deadlock.c:
  Import new version
storage/bdb/db_dump/db_dump.c:
  Import new version
storage/bdb/db_dump185/db_dump185.c:
  Import new version
storage/bdb/db_load/db_load.c:
  Import new version
storage/bdb/db_printlog/README:
  Import new version
storage/bdb/db_printlog/commit.awk:
  Import new version
storage/bdb/db_printlog/count.awk:
  Import new version
storage/bdb/db_printlog/db_printlog.c:
  Import new version
storage/bdb/db_printlog/dbname.awk:
  Import new version
storage/bdb/db_printlog/fileid.awk:
  Import new version
storage/bdb/db_printlog/logstat.awk:
  Import new version
storage/bdb/db_printlog/pgno.awk:
  Import new version
storage/bdb/db_printlog/range.awk:
  Import new version
storage/bdb/db_printlog/rectype.awk:
  Import new version
storage/bdb/db_printlog/status.awk:
  Import new version
storage/bdb/db_printlog/txn.awk:
  Import new version
storage/bdb/db_recover/db_recover.c:
  Import new version
storage/bdb/db_stat/db_stat.c:
  Import new version
storage/bdb/db_stat/dd.sh:
  Import new version
storage/bdb/db_upgrade/db_upgrade.c:
  Import new version
storage/bdb/db_verify/db_verify.c:
  Import new version
storage/bdb/dbinc/btree.h:
  Import new version
storage/bdb/dbinc/crypto.h:
  Import new version
storage/bdb/dbinc/cxx_int.h:
  Import new version
storage/bdb/dbinc/db.in:
  Import new version
storage/bdb/dbinc/db_185.in:
  Import new version
storage/bdb/dbinc/db_am.h:
  Import new version
storage/bdb/dbinc/db_cxx.in:
  Import new version
storage/bdb/dbinc/db_dispatch.h:
  Import new version
storage/bdb/dbinc/db_int.in:
  Import new version
storage/bdb/dbinc/db_join.h:
  Import new version
storage/bdb/dbinc/db_page.h:
  Import new version
storage/bdb/dbinc/db_server_int.h:
  Import new version
storage/bdb/dbinc/db_shash.h:
  Import new version
storage/bdb/dbinc/db_swap.h:
  Import new version
storage/bdb/dbinc/db_upgrade.h:
  Import new version
storage/bdb/dbinc/db_verify.h:
  Import new version
storage/bdb/dbinc/debug.h:
  Import new version
storage/bdb/dbinc/fop.h:
  Import new version
storage/bdb/dbinc/globals.h:
  Import new version
storage/bdb/dbinc/hash.h:
  Import new version
storage/bdb/dbinc/hmac.h:
  Import new version
storage/bdb/dbinc/lock.h:
  Import new version
storage/bdb/dbinc/log.h:
  Import new version
storage/bdb/dbinc/mp.h:
  Import new version
storage/bdb/dbinc/mutex.h:
  Import new version
storage/bdb/dbinc/os.h:
  Import new version
storage/bdb/dbinc/qam.h:
  Import new version
storage/bdb/dbinc/queue.h:
  Import new version
storage/bdb/dbinc/region.h:
  Import new version
storage/bdb/dbinc/rep.h:
  Import new version
storage/bdb/dbinc/shqueue.h:
  Import new version
storage/bdb/dbinc/tcl_db.h:
  Import new version
storage/bdb/dbinc/txn.h:
  Import new version
storage/bdb/dbinc/xa.h:
  Import new version
storage/bdb/dbm/dbm.c:
  Import new version
storage/bdb/dbreg/dbreg.c:
  Import new version
storage/bdb/dbreg/dbreg.src:
  Import new version
storage/bdb/dbreg/dbreg_rec.c:
  Import new version
storage/bdb/dbreg/dbreg_stat.c:
  Import new version
storage/bdb/dbreg/dbreg_util.c:
  Import new version
storage/bdb/dist/Makefile.in:
  Import new version
storage/bdb/dist/RELEASE:
  Import new version
storage/bdb/dist/aclocal/libtool.ac:
  Import new version
storage/bdb/dist/aclocal/mutex.ac:
  Import new version
storage/bdb/dist/aclocal/options.ac:
  Import new version
storage/bdb/dist/aclocal/programs.ac:
  Import new version
storage/bdb/dist/aclocal/rpc.ac:
  Import new version
storage/bdb/dist/aclocal/sequence.ac:
  Import new version
storage/bdb/dist/aclocal/sosuffix.ac:
  Import new version
storage/bdb/dist/aclocal/tcl.ac:
  Import new version
storage/bdb/dist/aclocal/types.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_check_class.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_check_classpath.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_check_junit.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_check_rqrd_class.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_java_options.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_jni_include_dirs.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_prog_jar.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_prog_java.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_prog_java_works.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_prog_javac.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_prog_javac_works.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_prog_javadoc.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_prog_javah.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_try_compile_java.ac:
  Import new version
storage/bdb/dist/aclocal_java/ac_try_run_javac.ac:
  Import new version
storage/bdb/dist/buildrel:
  Import new version
storage/bdb/dist/config.guess:
  Import new version
storage/bdb/dist/config.sub:
  Import new version
storage/bdb/dist/configure.ac:
  Import new version
storage/bdb/dist/gen_rec.awk:
  Import new version
storage/bdb/dist/gen_rpc.awk:
  Import new version
storage/bdb/dist/ltmain.sh:
  Import new version
storage/bdb/dist/pubdef.in:
  Import new version
storage/bdb/dist/s_all:
  Import new version
storage/bdb/dist/s_config:
  Import new version
storage/bdb/dist/s_crypto:
  Import new version
storage/bdb/dist/s_include:
  Import new version
storage/bdb/dist/s_java_const:
  Import new version
storage/bdb/dist/s_java_stat:
  Import new version
storage/bdb/dist/s_java_swig:
  Import new version
storage/bdb/dist/s_java:
  Import new version
storage/bdb/dist/s_je2db:
  Import new version
storage/bdb/dist/s_perm:
  Import new version
storage/bdb/dist/s_readme:
  Import new version
storage/bdb/dist/s_recover:
  Import new version
storage/bdb/dist/s_rpc:
  Import new version
storage/bdb/dist/s_symlink:
  Import new version
storage/bdb/dist/s_tags:
  Import new version
storage/bdb/dist/s_test:
  Import new version
storage/bdb/dist/s_vxworks:
  Import new version
storage/bdb/dist/s_win32_dsp:
  Import new version
storage/bdb/dist/s_win32:
  Import new version
storage/bdb/dist/s_winmsi:
  Import new version
storage/bdb/dist/srcfiles.in:
  Import new version
storage/bdb/dist/vx_buildcd:
  Import new version
storage/bdb/dist/vx_config.in:
  Import new version
storage/bdb/dist/vx_setup/LICENSE.TXT:
  Import new version
storage/bdb/dist/win_config.in:
  Import new version
storage/bdb/dist/win_db.in:
  Import new version
storage/bdb/dist/win_exports.in:
  Import new version
storage/bdb/dist/winmsi/files.in:
  Import new version
storage/bdb/dist/winmsi/links.in:
  Import new version
storage/bdb/dist/winmsi/s_winmsi.fcn:
  Import new version
storage/bdb/dist/winmsi/winbuild.bat:
  Import new version
storage/bdb/env/db_salloc.c:
  Import new version
storage/bdb/env/db_shash.c:
  Import new version
storage/bdb/env/env_file.c:
  Import new version
storage/bdb/env/env_method.c:
  Import new version
storage/bdb/env/env_open.c:
  Import new version
storage/bdb/env/env_recover.c:
  Import new version
storage/bdb/env/env_region.c:
  Import new version
storage/bdb/env/env_stat.c:
  Import new version
storage/bdb/fileops/fileops.src:
  Import new version
storage/bdb/fileops/fop_basic.c:
  Import new version
storage/bdb/fileops/fop_rec.c:
  Import new version
storage/bdb/fileops/fop_util.c:
  Import new version
storage/bdb/hash/hash.c:
  Import new version
storage/bdb/hash/hash.src:
  Import new version
storage/bdb/hash/hash_conv.c:
  Import new version
storage/bdb/hash/hash_dup.c:
  Import new version
storage/bdb/hash/hash_func.c:
  Import new version
storage/bdb/hash/hash_meta.c:
  Import new version
storage/bdb/hash/hash_method.c:
  Import new version
storage/bdb/hash/hash_open.c:
  Import new version
storage/bdb/hash/hash_page.c:
  Import new version
storage/bdb/hash/hash_rec.c:
  Import new version
storage/bdb/hash/hash_reclaim.c:
  Import new version
storage/bdb/hash/hash_stat.c:
  Import new version
storage/bdb/hash/hash_stub.c:
  Import new version
storage/bdb/hash/hash_upgrade.c:
  Import new version
storage/bdb/hash/hash_verify.c:
  Import new version
storage/bdb/hmac/hmac.c:
  Import new version
storage/bdb/hmac/sha1.c:
  Import new version
storage/bdb/hsearch/hsearch.c:
  Import new version
storage/bdb/lock/Design:
  Import new version
storage/bdb/lock/lock.c:
  Import new version
storage/bdb/lock/lock_deadlock.c:
  Import new version
storage/bdb/lock/lock_id.c:
  Import new version
storage/bdb/lock/lock_list.c:
  Import new version
storage/bdb/lock/lock_method.c:
  Import new version
storage/bdb/lock/lock_region.c:
  Import new version
storage/bdb/lock/lock_stat.c:
  Import new version
storage/bdb/lock/lock_timer.c:
  Import new version
storage/bdb/lock/lock_util.c:
  Import new version
storage/bdb/log/log.c:
  Import new version
storage/bdb/log/log_archive.c:
  Import new version
storage/bdb/log/log_compare.c:
  Import new version
storage/bdb/log/log_get.c:
  Import new version
storage/bdb/log/log_method.c:
  Import new version
storage/bdb/log/log_put.c:
  Import new version
storage/bdb/log/log_stat.c:
  Import new version
storage/bdb/mp/mp_alloc.c:
  Import new version
storage/bdb/mp/mp_bh.c:
  Import new version
storage/bdb/mp/mp_fget.c:
  Import new version
storage/bdb/mp/mp_fmethod.c:
  Import new version
storage/bdb/mp/mp_fopen.c:
  Import new version
storage/bdb/mp/mp_fput.c:
  Import new version
storage/bdb/mp/mp_fset.c:
  Import new version
storage/bdb/mp/mp_method.c:
  Import new version
storage/bdb/mp/mp_region.c:
  Import new version
storage/bdb/mp/mp_register.c:
  Import new version
storage/bdb/mp/mp_stat.c:
  Import new version
storage/bdb/mp/mp_sync.c:
  Import new version
storage/bdb/mp/mp_trickle.c:
  Import new version
storage/bdb/mutex/README:
  Import new version
storage/bdb/mutex/mut_fcntl.c:
  Import new version
storage/bdb/mutex/mut_pthread.c:
  Import new version
storage/bdb/mutex/mut_tas.c:
  Import new version
storage/bdb/mutex/mut_win32.c:
  Import new version
storage/bdb/mutex/tm.c:
  Import new version
storage/bdb/mutex/uts4_cc.s:
  Import new version
storage/bdb/os/os_abs.c:
  Import new version
storage/bdb/os/os_alloc.c:
  Import new version
storage/bdb/os/os_clock.c:
  Import new version
storage/bdb/os/os_config.c:
  Import new version
storage/bdb/os/os_dir.c:
  Import new version
storage/bdb/os/os_errno.c:
  Import new version
storage/bdb/os/os_fid.c:
  Import new version
storage/bdb/os/os_fsync.c:
  Import new version
storage/bdb/os/os_handle.c:
  Import new version
storage/bdb/os/os_id.c:
  Import new version
storage/bdb/os/os_map.c:
  Import new version
storage/bdb/os/os_method.c:
  Import new version
storage/bdb/os/os_oflags.c:
  Import new version
storage/bdb/os/os_open.c:
  Import new version
storage/bdb/os/os_region.c:
  Import new version
storage/bdb/os/os_rename.c:
  Import new version
storage/bdb/os/os_root.c:
  Import new version
storage/bdb/os/os_rpath.c:
  Import new version
storage/bdb/os/os_rw.c:
  Import new version
storage/bdb/os/os_seek.c:
  Import new version
storage/bdb/os/os_sleep.c:
  Import new version
storage/bdb/os/os_spin.c:
  Import new version
storage/bdb/os/os_stat.c:
  Import new version
storage/bdb/os/os_tmpdir.c:
  Import new version
storage/bdb/os/os_truncate.c:
  Import new version
storage/bdb/os/os_unlink.c:
  Import new version
storage/bdb/os_win32/os_abs.c:
  Import new version
storage/bdb/os_win32/os_clock.c:
  Import new version
storage/bdb/os_win32/os_config.c:
  Import new version
storage/bdb/os_win32/os_dir.c:
  Import new version
storage/bdb/os_win32/os_errno.c:
  Import new version
storage/bdb/os_win32/os_fid.c:
  Import new version
storage/bdb/os_win32/os_fsync.c:
  Import new version
storage/bdb/os_win32/os_handle.c:
  Import new version
storage/bdb/os_win32/os_map.c:
  Import new version
storage/bdb/os_win32/os_open.c:
  Import new version
storage/bdb/os_win32/os_rename.c:
  Import new version
storage/bdb/os_win32/os_rw.c:
  Import new version
storage/bdb/os_win32/os_seek.c:
  Import new version
storage/bdb/os_win32/os_sleep.c:
  Import new version
storage/bdb/os_win32/os_spin.c:
  Import new version
storage/bdb/os_win32/os_stat.c:
  Import new version
storage/bdb/os_win32/os_truncate.c:
  Import new version
storage/bdb/os_win32/os_unlink.c:
  Import new version
storage/bdb/qam/qam.c:
  Import new version
storage/bdb/qam/qam.src:
  Import new version
storage/bdb/qam/qam_conv.c:
  Import new version
storage/bdb/qam/qam_files.c:
  Import new version
storage/bdb/qam/qam_method.c:
  Import new version
storage/bdb/qam/qam_open.c:
  Import new version
storage/bdb/qam/qam_rec.c:
  Import new version
storage/bdb/qam/qam_stat.c:
  Import new version
storage/bdb/qam/qam_stub.c:
  Import new version
storage/bdb/qam/qam_upgrade.c:
  Import new version
storage/bdb/qam/qam_verify.c:
  Import new version
storage/bdb/rep/rep.src:
  Import new version
storage/bdb/rep/rep_backup.c:
  Import new version
storage/bdb/rep/rep_method.c:
  Import new version
storage/bdb/rep/rep_record.c:
  Import new version
storage/bdb/rep/rep_region.c:
  Import new version
storage/bdb/rep/rep_stat.c:
  Import new version
storage/bdb/rep/rep_stub.c:
  Import new version
storage/bdb/rep/rep_util.c:
  Import new version
storage/bdb/sequence/seq_stat.c:
  Import new version
storage/bdb/sequence/sequence.c:
  Import new version
storage/bdb/txn/txn.c:
  Import new version
storage/bdb/txn/txn.src:
  Import new version
storage/bdb/txn/txn_method.c:
  Import new version
storage/bdb/txn/txn_rec.c:
  Import new version
storage/bdb/txn/txn_recover.c:
  Import new version
storage/bdb/txn/txn_region.c:
  Import new version
storage/bdb/txn/txn_stat.c:
  Import new version
storage/bdb/txn/txn_util.c:
  Import new version
storage/bdb/xa/xa.c:
  Import new version
storage/bdb/xa/xa_db.c:
  Import new version
storage/bdb/xa/xa_map.c:
  Import new version
2005-12-05 10:27:46 -08:00
unknown
81b2bbac05 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/examples/ha_tina.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
2005-11-24 02:56:12 +02:00
unknown
97bfd41fe1 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk


BitKeeper/etc/ignore:
  added libmysqld/ha_blackhole.cc
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Delete: libmysqld/ha_blackhole.cc
include/my_global.h:
  Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
  (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
mysql-test/r/federated.result:
  Update results after error message changes
mysql-test/r/grant.result:
  Update results after error message changes
mysql-test/r/grant2.result:
  Update results after error message changes
sql/ha_federated.cc:
  Fix error messages to be more consistent
sql/mysql_priv.h:
  Stack size to have when opening a table
  (This was needed on x86 64 bit Linux)
sql/share/errmsg.txt:
  Remove quotes around error string for federated as two quotes in the output looks strange
sql/sql_base.cc:
  More correct stack size
sql/sql_parse.cc:
  Set thread_stack before store_globals()
sql/unireg.h:
  More correct MAX_DBKEY_LENGTH
2005-11-24 02:36:28 +02:00
unknown
41de6f9a7c Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.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_table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/r/ps_1general.result:
  merge ("ul", will fix)
sql/examples/ha_tina.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/handler.h:
  merge
sql/log.cc:
  merge
sql/set_var.cc:
  merge
sql/share/errmsg.txt:
  merge (bad, will fix)
sql/sql_show.cc:
  merge (bad, will fix)
sql/sql_yacc.yy:
  merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  merge
2005-11-18 16:38:01 +01:00
unknown
1f7fb05c4c Added number of files into ignore list for win32 build within bk tree. 2005-11-14 16:36:05 +03:00
unknown
242e020a8d Add generated files to ignore list
BitKeeper/etc/ignore:
  Add missing files
2005-11-07 16:39:20 -08:00
unknown
9314a20745 Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.


BitKeeper/etc/ignore:
  added libmysqld/sql_plugin.cc
include/Makefile.am:
  Added plugin.hd
include/m_ctype.h:
  Added my_strchr
include/my_base.h:
  Added HA_USES_PARSER
  Merge with old 5.1 tree
libmysqld/Makefile.am:
  Added sql_plugin.cc
mysql-test/r/ndb_gis.result:
  Fixed results after merge
sql/Makefile.am:
  Addes sql_plugin.h and sql_plugin.cc
sql/ha_heap.h:
  Indentation fix
sql/ha_partition.cc:
  Made partition_hton visible outside
  After merge fixes (for call to get_new_handler)
sql/handler.cc:
  Added partition_hton to handlerton
sql/handler.h:
  Added partion to handlerton
  Updated mysql_unpack_partion() from old 5.1 tree
sql/mysql_priv.h:
  Added sql_plugin.h
sql/records.cc:
  After merge fix
sql/share/errmsg.txt:
  Added new errors messages from old 5.1 tree
sql/sql_partition.cc:
  Removed compiler warnings
  Updated mysql_unpack_partition() from latest 5.1 tree
sql/structs.h:
  Update KEY from latest 5.1 tree (to get table.cc to compile)
sql/table.cc:
  Merged .frm format from 5.0, new 5.1 and old 5.1 tree
  (We now use same format as the old 5.1 tree)
  Note that this patch includes code for HA_USE_PARSER which is not usable until rest of 5.1 tree is restored
sql/unireg.cc:
  Merged .frm format from 5.0, new 5.1 and old 5.1 tree
  (We now use same format as the old 5.1 tree)
  Note that this patch includes code for HA_USE_PARSER which is not usable until rest of 5.1 tree is restored
strings/Makefile.am:
  Added my_strchr.c
include/plugin.h:
  New BitKeeper file ``include/plugin.h''
sql/sql_plugin.cc:
  New BitKeeper file ``sql/sql_plugin.cc''
sql/sql_plugin.h:
  New BitKeeper file ``sql/sql_plugin.h''
strings/my_strchr.c:
  New BitKeeper file ``strings/my_strchr.c''
2005-11-05 13:20:35 +02:00
unknown
d04832d195 Merge
BitKeeper/etc/ignore:
  auto-union
BUILD/autorun.sh:
  Auto merged
BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1:
  Auto merged
BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf:
  Auto merged
BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a:
  Auto merged
BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2:
  Auto merged
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysys/default.c:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/data/data0data.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/include/btr0btr.h:
  Auto merged
storage/innobase/include/data0type.ic:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0mem.h:
  Auto merged
storage/innobase/include/mem0mem.h:
  Auto merged
storage/innobase/include/mem0mem.ic:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/ut0mem.h:
  Auto merged
storage/innobase/mem/mem0mem.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/os/os0proc.c:
  Auto merged
storage/innobase/rem/rem0rec.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0sys.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/innobase/ut/ut0mem.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dbug.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_delete_all.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sp_key.c:
  Auto merged
storage/myisammrg/myrg_rkey.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiVersion.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
BUILD/SETUP.sh:
  merge
BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be:
  SCCS merged
libmysqld/Makefile.am:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/handler.h:
  merge
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
sql/slave.cc:
  merge
sql/slave.h:
  e
  merge
sql/sql_parse.cc:
  merge
sql/table.cc:
  merge
sql/examples/ha_tina.cc:
  merge
sql/examples/ha_tina.h:
  merge
sql/share/errmsg.txt:
  merge
storage/ndb/include/ndbapi/Ndb.hpp:
  merge
storage/ndb/src/common/debugger/EventLogger.cpp:
  merge
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
  SCCS merged
2005-10-06 10:54:07 +02:00
unknown
7382cc71e6 Add files for bdb/build_win64, and tweak the configuration to skip over
parts of the library we have omitted.


storage/bdb/dist/s_config:
  Change mode to -rw-r--r--
storage/bdb/dist/s_crypto:
  Change mode to -rw-r--r--
storage/bdb/dist/s_dir:
  Change mode to -rw-r--r--
storage/bdb/dist/s_include:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java_const:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java_stat:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java_swig:
  Change mode to -rw-r--r--
storage/bdb/dist/s_javah:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java:
  Change mode to -rw-r--r--
storage/bdb/dist/s_je2db:
  Change mode to -rw-r--r--
storage/bdb/dist/s_readme:
  Change mode to -rw-r--r--
storage/bdb/dist/s_rpc:
  Change mode to -rw-r--r--
storage/bdb/dist/s_test:
  Change mode to -rw-r--r--
storage/bdb/dist/s_vxworks:
  Change mode to -rw-r--r--
storage/bdb/dist/s_win32_dsp:
  Change mode to -rw-r--r--
storage/bdb/dist/s_win32:
  Change mode to -rw-r--r--
storage/bdb/dist/s_winmsi:
  Change mode to -rw-r--r--
storage/bdb/dist/s_all:
  Don't bother with VxWorks or Java stuff
storage/bdb/dist/s_perm:
  Skip mod_db4 handling
storage/bdb/dist/s_recover:
  Skip examples handling
storage/bdb/dist/s_symlink:
  Skip examples handling
storage/bdb/dist/s_tags:
  Skip test_perf handling
BitKeeper/deleted/.del-build_all.dsp~8d55522d9eb8f029:
  Delete: storage/bdb/build_win32/build_all.dsp
BitKeeper/deleted/.del-db_java_xa.dsp~dffbaca42fa2dc81:
  Delete: storage/bdb/build_win32/db_java_xa.dsp
BitKeeper/deleted/.del-db_lib.dsp~4cc7531e4cd72267:
  Delete: storage/bdb/build_win32/db_lib.dsp
BitKeeper/etc/ignore:
  Simplify some storage/bdb ignore rules
storage/bdb/build_win32/small_dsp.src:
  New BitKeeper file ``storage/bdb/build_win32/small_dsp.src''
storage/bdb/build_win64/app_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/app_dsp.src''
storage/bdb/build_win64/db_test.src:
  New BitKeeper file ``storage/bdb/build_win64/db_test.src''
storage/bdb/build_win64/dynamic_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/dynamic_dsp.src''
storage/bdb/build_win64/ex_repquote.src:
  New BitKeeper file ``storage/bdb/build_win64/ex_repquote.src''
storage/bdb/build_win64/java_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/java_dsp.src''
storage/bdb/build_win64/libdbrc.src:
  New BitKeeper file ``storage/bdb/build_win64/libdbrc.src''
storage/bdb/build_win64/small_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/small_dsp.src''
storage/bdb/build_win64/srcfile_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/srcfile_dsp.src''
storage/bdb/build_win64/static_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/static_dsp.src''
storage/bdb/build_win64/tcl_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/tcl_dsp.src''
2005-09-22 16:42:39 -07:00
unknown
e290e617ea Remove some files that should not have been added with BDB upgrade,
and update ignore file after move of storage engines to storage/.


BitKeeper/deleted/.del-.IGNORE_ME~7d48c5cc6a693365:
  Delete: storage/bdb/build_unix/.IGNORE_ME
BitKeeper/deleted/.del-config.hin~6c9fcc7865fbb64a:
  Delete: storage/bdb/dist/config.hin
BitKeeper/deleted/.del-db_server_proc~f547043c24590673:
  Delete: storage/bdb/dist/template/db_server_proc
BitKeeper/deleted/.del-gen_client_ret~ae4ef5cef951bd76:
  Delete: storage/bdb/dist/template/gen_client_ret
BitKeeper/deleted/.del-rec_btree~a5adf9b5626f4d9f:
  Delete: storage/bdb/dist/template/rec_btree
BitKeeper/deleted/.del-rec_crdel~7300927240b9d2d7:
  Delete: storage/bdb/dist/template/rec_crdel
BitKeeper/deleted/.del-rec_dbreg~b44e71f4622abd02:
  Delete: storage/bdb/dist/template/rec_dbreg
BitKeeper/deleted/.del-rec_db~f59dc271ee2f2ed3:
  Delete: storage/bdb/dist/template/rec_db
BitKeeper/deleted/.del-rec_fileops~86598044415274cd:
  Delete: storage/bdb/dist/template/rec_fileops
BitKeeper/deleted/.del-db_server.x~f2754d16c385befc:
  Delete: storage/bdb/rpc_server/db_server.x
BitKeeper/deleted/.del-db_server_proc.c~550295a7279e753:
  Delete: storage/bdb/rpc_server/c/db_server_proc.c
BitKeeper/deleted/.del-gen_client.c~3bea25e4cabac1d5:
  Delete: storage/bdb/rpc_client/gen_client.c
BitKeeper/deleted/.del-gen_db_server.c~978be757dca7e000:
  Delete: storage/bdb/rpc_server/c/gen_db_server.c
BitKeeper/deleted/.del-rec_hash~8b32ca72e303bedd:
  Delete: storage/bdb/dist/template/rec_hash
BitKeeper/deleted/.del-rec_qam~b914dc918c67b2d0:
  Delete: storage/bdb/dist/template/rec_qam
BitKeeper/deleted/.del-rec_txn~787bfed583e17818:
  Delete: storage/bdb/dist/template/rec_txn
BitKeeper/etc/ignore:
  Update files to ignore from storage engine directions, especially bdb,
  and some new additions to be ignored from libmysqld.
2005-09-22 15:53:18 -07:00
unknown
38ebb6c638 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/opt/local/work/mysql-5.0-root


BitKeeper/etc/ignore:
  auto-union
include/my_sys.h:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-09-23 00:46:59 +04:00
unknown
7d6d4c8355 Fixed problems found by valgrind
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables


BitKeeper/etc/ignore:
  added libmysqld/sql_cursor.h
mysql-test/r/information_schema.result:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middlecd
mysql-test/r/information_schema_inno.result:
  Remove used tables at start
mysql-test/r/multi_statement.result:
  Remove used tables at start
mysql-test/r/temp_table.result:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle
mysql-test/r/type_bit.result:
  More tests
mysql-test/t/information_schema.test:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle
mysql-test/t/information_schema_inno.test:
  Remove used tables at start
mysql-test/t/multi_statement.test:
  Remove used tables at start
mysql-test/t/temp_table.test:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle
mysql-test/t/type_bit.test:
  More tests
mysql-test/valgrind.supp:
  Removed some valgrind warnings that isn't errors
sql/ha_federated.cc:
  Fixed errors discovered by valgrind:
  - Socket was not initialized
  - share->scheme was deleted while there was still pointer into it from the hash
sql/item_func.h:
  Remove access to table object from cleanup() as the table object may have been dropped earlier (In case of temporary tables or of close_thread_tables() is run before cleanup())
  This fixed a bug with access to already freed memory
sql/sql_base.cc:
  Reset variables used by fulltext
sql/sql_select.cc:
  Fixed various problems with bit fields when used in internal temporary tables.
  Calculate space needed for bit fields correctly (previously we allocated more space than needed for rows in heap/myisam tables)
2005-09-22 03:23:07 +03:00
unknown
f6da85f419 Merge mysql.com:/home/my/mysql-4.0
into  mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106:
  Auto merged
BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14:
  Auto merged
BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
  Auto merged
BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
  Auto merged
BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
  Auto merged
BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
  Auto merged
BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
  Auto merged
BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
  Auto merged
BitKeeper/deleted/.del-query_cache_notembedded.test:
  Auto merged
BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
mysql-test/t/ansi.test:
  Auto merged
mysql-test/t/backup-master.sh:
  Auto merged
mysql-test/t/bdb-alter-table-2-master.opt:
  Auto merged
mysql-test/t/bdb-deadlock.test:
  Auto merged
mysql-test/t/bdb_cache-master.opt:
  Auto merged
mysql-test/t/bdb_cache.test:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/constraints.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ctype_cp1251.test:
  Auto merged
mysql-test/t/ctype_latin1_de-master.opt:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/ctype_tis620.test:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
mysql-test/t/drop_temp_table.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/func_encrypt-master.opt:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/func_isnull.test:
  Auto merged
mysql-test/t/gcc296.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/init_file-master.opt:
  Auto merged
mysql-test/t/init_file.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb_cache-master.opt:
  Auto merged
mysql-test/t/innodb_cache.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/isam.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/lock_tables_lost_commit-master.opt:
  Auto merged
mysql-test/t/lock_tables_lost_commit.test:
  Auto merged
mysql-test/t/lowercase_table-master.opt:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table2.test:
  Auto merged
mysql-test/t/lowercase_table3-master.opt:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/multi_update-master.opt:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/myisam-blob-master.opt:
  Auto merged
mysql-test/t/myisam-blob.test:
  Auto merged
mysql-test/t/mysqlbinlog-master.opt:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/packet.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/query_cache_merge.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_alter.test:
  Auto merged
mysql-test/t/rpl_chain_temp_table.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_do_grant.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table-slave.opt:
  Auto merged
mysql-test/t/rpl_commit_after_flush.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop-master.opt:
  Auto merged
mysql-test/t/rpl_flush_log_loop-master.sh:
  Auto merged
mysql-test/t/rpl_flush_log_loop-slave.opt:
  Auto merged
mysql-test/t/rpl_flush_log_loop-slave.sh:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_ignore_grant-slave.opt:
  Auto merged
mysql-test/t/rpl_ignore_grant.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_free_items.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m-master.opt:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s-slave.opt:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_loaddatalocal.test:
  Auto merged
mysql-test/t/rpl_log-master.opt:
  Auto merged
mysql-test/t/rpl_log-slave.opt:
  Auto merged
mysql-test/t/rpl_master_pos_wait.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_multi_delete-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete.test:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged
mysql-test/t/rpl_optimize.test:
  Auto merged
mysql-test/t/rpl_relayspace-slave.opt:
  Auto merged
mysql-test/t/rpl_relayspace.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_skip_error-slave.opt:
  Auto merged
mysql-test/t/rpl_skip_error.test:
  Auto merged
mysql-test/t/rpl_multi_update.test:
  Auto merged
mysql-test/t/rpl_multi_update2.test:
  Auto merged
mysql-test/t/rpl_server_id1.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/rpl_set_charset.test:
  Auto merged
mysql-test/t/rpl_start_stop_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/system_mysql_db_refs.test:
  Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
  Auto merged
mysql-test/t/timezone-master.opt:
  Auto merged
mysql-test/t/timezone.test:
  Auto merged
mysql-test/t/type_set.test:
  Auto merged
mysql-test/t/variables-master.opt:
  Auto merged
mysql-test/t/timezone3.test:
  Auto merged
2005-09-15 17:17:26 +03:00
unknown
900645b87a Turn off EOLN_NATIVE flag for all test files
Ignored some generated files


mysql-test/t/analyze.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ansi-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ansi.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/backup-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb-alter-table-2-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb-deadlock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/bool.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/cast.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/constraints.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/convert.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/create_select_tmp.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_cp1251-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_cp1251.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_latin1_de-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_latin1_de.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_tis620-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_tis620.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_ujis-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_ujis.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/drop_temp_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/flush_block_commit.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_concat.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_encrypt-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_if.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_isnull.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/gcc296.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_file-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_file.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb-deadlock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb-lock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_handler.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/isam.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/loaddata.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_multi.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_tables_lost_commit-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_tables_lost_commit.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table3-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table3.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mix_innodb_myisam_binlog-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/mix_innodb_myisam_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/multi_update-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/myisam-blob-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/myisam-blob.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqlbinlog-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqlbinlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqldump.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/packet.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache_merge.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache_notembedded.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair_part2-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair_part2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl000016-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_EE_error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_alter.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_chain_temp_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_change_master.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_commit_after_flush.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_do_grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_drop.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_empty_master_crash.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_error_ignored_table-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_error_ignored_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_failsafe.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-slave.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_free_items-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_free_items.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_get_lock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_heap.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_ignore_grant-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_ignore_grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_insert_id.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_m-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_m.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_s-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_s.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddatalocal.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_log-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_log-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_master_pos_wait.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_max_relay_size.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_optimize.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayspace-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayspace.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_reset_slave.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id1.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_set_charset.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_skip_error-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_skip_error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_start_stop_slave.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_trunc_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_fix-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_fix.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_refs.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone3-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone3.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/type_set.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/variables-master.opt:
  Turn off EOLN_NATIVE flag
BitKeeper/etc/ignore:
  added support-files/MacOSX/preflight
2005-09-15 17:14:39 +03:00
unknown
011f12d014 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  merge
ndb/test/ndbapi/bank/Bank.cpp:
  merge
ndb/test/ndbapi/bank/Bank.hpp:
  merge
ndb/test/src/UtilTransactions.cpp:
  merge
2005-09-09 12:54:03 +02:00
unknown
b1fab24ce2 ndb
new testprogram testSRBank


BitKeeper/etc/ignore:
  Added ndb/test/ndbapi/testSRBank to the ignore list
ndb/test/include/NDBT_Test.hpp:
  incProperty
ndb/test/ndbapi/Makefile.am:
  new test program
ndb/test/ndbapi/bank/Bank.cpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/ndbapi/bank/Bank.hpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/src/NDBT_Test.cpp:
  incProperty
ndb/test/src/UtilTransactions.cpp:
  close transaction if failed
ndb/test/ndbapi/testSRBank.cpp:
  New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''
2005-09-09 12:39:06 +02:00
unknown
4773490d87 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/new/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
2005-09-05 08:35:58 +03:00
unknown
173e5df37f Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
  Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
configure.in:
  Auto merged
mysql-test/include/ps_conv.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/client/mysqltest.dsp:
  manual merge
VC++Files/sql/mysqld.dsp:
  manual merge
mysql-test/r/grant2.result:
  patch merge
mysql-test/r/subselect2.result:
  manual merge
mysql-test/t/grant2.test:
  patch merge
mysys/charset.c:
  Remove already deleted function
sql/examples/ha_archive.h:
  Manual merge
sql/sql_acl.cc:
  manual merge
sql/sql_db.cc:
  merge (no differences)
sql/sql_select.cc:
  manual merge
sql/table.h:
  merge (no differences)
tests/mysql_client_test.c:
  patch merge
2005-08-25 06:55:48 +03:00
unknown
4652c6b053 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication).
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.  


mysql-test/r/rpl_drop_db.result:
  test for query buffer overrun
mysql-test/t/rpl_drop_db.test:
  test for query buffer overrun
sql/mysql_priv.h:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
BitKeeper/etc/ignore:
  Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
sql/sql_db.cc:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
sql/sql_table.cc:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
sql/table.h:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
2005-08-18 21:40:14 -06:00
unknown
6843d1d89c forgotten 'return'
BitKeeper/etc/ignore:
  Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
2005-08-14 23:20:06 +02:00
unknown
36b6bf2ef3 Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_many.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/distinct.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/endspace.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/func_compress.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/func_date_add.test:
  Auto merged
mysql-test/t/func_equal.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_set.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/heap_hash.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/keywords.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/lock.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_grant.later:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
mysql-test/t/ndb_update.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/t/olap.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/ps_4heap.test:
  Auto merged
mysql-test/t/ps_5merge.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/replace.test:
  Auto merged
mysql-test/t/row.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/rpl_create_database.test:
  Auto merged
mysql-test/t/rpl_ddl.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_multi_query.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_redirect.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
mysql-test/t/rpl_timezone.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/synchronization.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
mysql-test/t/timezone2.test:
  Auto merged
mysql-test/t/timezone_grant.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Simple merge
mysql-test/r/ps_grant.result:
  Simple merge
mysql-test/t/analyse.test:
  Simple merge
mysql-test/t/auto_increment.test:
  Simple merge
mysql-test/t/bdb.test:
  Simple merge
mysql-test/t/bigint.test:
  Simple merge
mysql-test/t/case.test:
  Simple merge
mysql-test/t/cast.test:
  Simple merge
mysql-test/t/check.test:
  Simple merge
mysql-test/t/count_distinct.test:
  Simple merge
mysql-test/t/ctype_latin1_de.test:
  Simple merge
mysql-test/t/ctype_uca.test:
  Simple merge
mysql-test/t/ctype_ucs.test:
  Simple merge
mysql-test/t/ctype_utf8.test:
  Simple merge
mysql-test/t/delete.test:
  Simple merge
mysql-test/t/flush_block_commit.test:
  Simple merge
mysql-test/t/func_default.test:
  Simple merge
mysql-test/t/func_gconcat.test:
  Simple merge
mysql-test/t/func_group.test:
  Aligned code with 4.1
mysql-test/t/func_in.test:
  Simple merge
mysql-test/t/func_math.test:
  Simple merge
mysql-test/t/func_misc.test:
  Simple merge
mysql-test/t/func_test.test:
  Simple merge
mysql-test/t/func_time.test:
  Simple merge
mysql-test/t/group_by.test:
  Simple merge
mysql-test/t/having.test:
  Simple merge
mysql-test/t/innodb.test:
  Simple merge
mysql-test/t/insert.test:
  Simple merge
mysql-test/t/join_outer.test:
  Simple merge
mysql-test/t/kill.test:
  Simple merge
mysql-test/t/loaddata.test:
  Simple merge
mysql-test/t/lock_multi.test:
  Simple merge
mysql-test/t/multi_update.test:
  Simple merge
mysql-test/t/mysqlbinlog.test:
  Simple merge
mysql-test/t/mysqldump.test:
  Aligned code with 4.1
mysql-test/t/mysqltest.test:
  Simple merge
mysql-test/t/ndb_basic.test:
  Simple merge
mysql-test/t/ndb_cache.test:
  Simple merge
mysql-test/t/ndb_subquery.test:
  Simple merge
mysql-test/t/ps_grant.test:
  Simple merge
mysql-test/t/range.test:
  Simple merge
mysql-test/t/rpl_drop_temp.test:
  Simple merge
mysql-test/t/rpl_loaddata_rule_s.test:
  Simple merge
mysql-test/t/rpl_loaddatalocal.test:
  Simple merge
mysql-test/t/rpl_rotate_logs.test:
  Simple merge
mysql-test/t/rpl_until.test:
  Simple merge
mysql-test/t/rpl_variables.test:
  Simple merge
mysql-test/t/select.test:
  Simple merge
mysql-test/t/sql_mode.test:
  Simple merge
mysql-test/t/type_blob.test:
  Simple merge
mysql-test/t/type_decimal.test:
  Simple merge
mysql-test/t/user_var.test:
  Simple merge
mysql-test/t/variables.test:
  Simple merge
sql/lock.cc:
  Simple optimization
sql/mysql_priv.h:
  Simple merge
sql/sql_table.cc:
  Simple merge
sql/table.cc:
  Simple merge
sql/unireg.cc:
  Simple merge
2005-07-28 17:09:54 +03:00
unknown
53f40f95f8 Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected
mysql-test/r/ps_grant.result:
  Deallocate prepare statements
  Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
mysql-test/t/ps_grant.test:
  Deallocate prepare statements
  Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
sql/sql_lex.cc:
  Fixed typo
mysql-test/r/not_embedded_server.result:
  New BitKeeper file ``mysql-test/r/not_embedded_server.result''
mysql-test/t/not_embedded_server.test:
  New BitKeeper file ``mysql-test/t/not_embedded_server.test''
BitKeeper/etc/ignore:
  added ndb/tools/ndb_config
2005-07-27 13:45:06 +03:00
unknown
d70aead730 Merge mysql.com:/home/my/mysql-4.0
into  mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
include/thr_lock.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Simple merge
2005-07-27 13:24:59 +03:00
unknown
90e41facf7 Review fixes:
Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()


include/thr_lock.h:
  bool -> my_bool (bool is not portable in C programs)
mysys/thr_lock.c:
  bool -> my_bool (bool is not portable in C programs)
sql/lock.cc:
  Added comment
  Don't use | on bool variable
sql/mysql_priv.h:
  Added comment
sql/slave.cc:
  Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
sql/sql_base.cc:
  Added comments
  my_sleep() -> pthread_cond_timedwait() to get less code and potentitally faster loop
BitKeeper/etc/ignore:
  added ac_available_languages_fragment
2005-07-26 17:55:58 +03:00
unknown
373a8703e8 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/new/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
2005-07-20 13:47:05 +03:00
unknown
a29f6ca1f5 Ignore mysql-test/var (I'm pushing it for the second time already :(()
BitKeeper/etc/ignore:
  added mysql-test/var
2005-07-20 00:02:49 +04:00
unknown
ff9be6130e Added mkinstalldirs (an auxiliary autotools symlink) to the ignore
list.


BitKeeper/etc/ignore:
  Added innobase/mkinstalldirs mkinstalldirs to the ignore list
innobase/mkinstalldirs:
  Ignore
mkinstalldirs:
  Ignore
2005-07-19 11:35:16 +04:00
unknown
6c08c1176f Added InnoDB offline file checksum utility.
extra/Makefile.am:
  Added innochecksum utility.
BitKeeper/etc/ignore:
  Added extra/innochecksum to the ignore list
2005-07-19 10:03:19 +03:00
unknown
476ca52ee7 Fix for BUG#11211 "GROUP BY doesn't work correctly"
When the GROUP BY clause contains a column reference that can be resolved to
both an aliased column in the SELECT list, and to a column in the FROM clause,
the group column is resolved to the column in the FROM clause (for ANSI conformance).
However, it may be so that the user's intent is just the other way around, and he/she
gets the query results grouped by a completely different column than expexted.
This patch adds a warning in such cases that tells the user that there is potential
ambiguity in the group column.

sql/sql_select.cc
- Added a warning when a GROUP column is ambiguous due to that there is a
  column reference with the same name both in the SELECT and FROM clauses.
  In this case we resolve to the column in FROM clause and warn the user
  of a possible ambiguity.
- More extensive comments.
- Changed the function to return bool instead of int (as in other places).

mysql-test/t/group_by.test
  Added test for BUG#11211.

mysql-test/r/group_by.result
  Added test for BUG#11211.


mysql-test/r/group_by.result:
  Import patch 11211.diff
mysql-test/t/group_by.test:
  Import patch 11211.diff
sql/sql_select.cc:
  Import patch 11211.diff
BitKeeper/etc/ignore:
  Added ndb/src/dummy.cpp to the ignore list
mysql-test/r/alias.result:
  Added warning for potentially ambiguous column.
mysql-test/r/having.result:
  Added warning for potentially ambiguous column.
2005-06-15 10:12:49 +03:00
unknown
3145787db9 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_key.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
sql/item_buff.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2005-06-07 06:38:05 -07:00
unknown
d09d815649 BUG#7967 Fix mysqlhotcopy --record-log-position
BitKeeper/etc/ignore:
  Added scripts/mysqlhotcopy.sh.rej to the ignore list
scripts/mysqlhotcopy.sh:
  BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
  that --record-log-pos option will work with all versions from 3.23
  forward and will not break again in the future if additional columns
  are added.
2005-06-06 22:17:16 -04:00
unknown
9b2e0ed5d2 Remove automatically generated autotools files from revision control.
Fix build scripts to create them.


BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
  Delete: config.guess
BitKeeper/deleted/.del-config.sub~d18f703b655db258:
  Delete: config.sub
BitKeeper/deleted/.del-depcomp~d5c35239e36674f1:
  Delete: depcomp
BitKeeper/deleted/.del-install-sh~ddc86c88a9bebd00:
  Delete: install-sh
BitKeeper/deleted/.del-ltconfig~6d12dc759ce40830:
  Delete: ltconfig
BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
  Delete: ltmain.sh
BitKeeper/deleted/.del-missing~3fe9ea908d3a7caa:
  Delete: missing
BitKeeper/deleted/.del-mkinstalldirs~fa914ace602e1447:
  Delete: mkinstalldirs
BUILD/FINISH.sh:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-ccc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-cxx:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-hpux11-parisc2-aCC:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-ia64-debug-max:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-irix-mips64-mipspro:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-pentium-pgcc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-forte:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-purify:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BitKeeper/etc/ignore:
  Added config.guess config.sub install-sh ltmain.sh missing to the ignore list
2005-05-18 15:23:29 +04:00
unknown
e10d81448d Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files


BitKeeper/etc/ignore:
  added tools/mysqltestmanager
client/mysqltest.c:
  Ensure that BIG_TEST is always set to 0 or 1
  Fix the 'eval' also honors 'require'
mysql-test/mysql-test-run.sh:
  Enlarge InnoDB table space for --big tests
mysql-test/r/heap.result:
  Fix after adding more optimzation for filsort
mysql-test/r/sum_distinct.result:
  Move 'slow' part of test to sum_distinct-big.test
mysql-test/t/heap.test:
  Ensure that results are indpendent of optimizer
mysql-test/t/sum_distinct.test:
  Move 'slow' part of test to sum_distinct-big.test
sql/filesort.cc:
  Use 'sort with data' also on temporary files and with INSERT ... SELECT
sql/ha_innodb.h:
  Remove HA_FAST_KEY_READ to enable buffered-record-reads after filesort
sql/handler.h:
  More comments
sql/mysql_priv.h:
  A bit smaller limit for cache for buffered-records-read (after testing)
sql/records.cc:
  Don't use buffered-record-reads if ref_length > MAX_REFLENGTH
  Fixed warning from valgrind in 'sum_distinct'
sql/sql_select.cc:
  Ensure that tempory tables has query_id set for all fields
  (Required for sort-with-data to work on temp files)
2005-04-07 19:24:14 +03:00
unknown
aeaebed310 removed a reference to non-existing file
BitKeeper/etc/ignore:
  added client/mysqltestmanagerc
2005-04-05 16:39:40 +02:00
unknown
0cd045ca49 typecast fix for windows 64-bit compilation error
BitKeeper/etc/ignore:
  Added VC++Files/client/mysql_amd64.dsp to the ignore list
2005-03-16 08:51:57 +01:00
unknown
48577bb59f merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/page0page.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-09 14:09:06 +01:00
unknown
16da840b78 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2005-03-07 16:23:41 +02:00
unknown
581e6a2b86 A fix for a bug #8830, which occured when binary data from blob was
dumped with --hex-blob and --skip-extended-insert options.


BitKeeper/etc/ignore:
  Added support-files/ndb-config-2-node.ini to the ignore list
client/mysqldump.c:
  A fix for a bug #8830. All that was necessary was to use unsigned  char
  instead of signed  char.
mysql-test/r/mysqldump.result:
  A result for   test case for bug #8830.
mysql-test/t/mysqldump.test:
  Test case for bug #8830.
2005-03-05 22:06:07 +02:00
unknown
2fc5d274e8 Fixing bug #8850 in such a way that when TRUNCATE is called within
stored  procedure,  it  is converted  to DELETE.


mysql-test/r/sp.result:
  A result for  the  test  case  for bug #8850
mysql-test/t/sp.test:
  A test  case  for the bug #8850
sql/sql_delete.cc:
  A fix for bug  #8850, plus adding a missing call  to mysql_init_select(),
  which  caused mem_root corruption.
sql/sql_parse.cc:
  A fix for the bug #8850
BitKeeper/etc/ignore:
  Added acinclude.m4 to the ignore list
2005-03-05 21:44:15 +02:00
unknown
8e3addf928 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  added support-files/ndb-config-2-node.ini
2005-02-28 12:00:18 +02:00
unknown
c5d4d50ab7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
2005-02-25 11:48:46 +01:00
unknown
5c15cc5c35 add auto generated ndb dsp-files (for msvc++ 6.0) to ignore file
BitKeeper/etc/ignore:
  added ndb/src/common/debugger/signaldata/libsignaldataprint.dsp ndb/src/common/debugger/libtrace.dsp ndb/src/common/logger/liblogger.dsp ndb/src/common/mgmcommon/libmgmsrvcommon.dsp ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp ndb/src/kernel/blocks/dbacc/libdbacc.dsp ndb/src/kernel/blocks/dbdict/libdbdict.dsp ndb/src/kernel/blocks/dbdih/libdbdih.dsp ndb/src/kernel/blocks/dblqh/libdblqh.dsp ndb/src/kernel/blocks/dbtc/libdbtc.dsp ndb/src/kernel/blocks/dbtup/libdbtup.dsp ndb/src/kernel/blocks/dbtux/libdbtux.dsp ndb/src/kernel/blocks/dbutil/libdbutil.dsp ndb/src/kernel/blocks/grep/libgrep.dsp ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp ndb/src/kernel/blocks/ndbfs/libndbfs.dsp ndb/src/kernel/blocks/qmgr/libqmgr.dsp ndb/src/kernel/blocks/suma/libsuma.dsp ndb/src/kernel/blocks/trix/libtrix.dsp ndb/src/kernel/error/liberror.dsp ndb/src/kernel/vm/libkernel.d
  sp ndb/src/kernel/ndbd.dsp ndb/src/mgmapi/libmgmapi.dsp ndb/src/mgmclient/ndb_mgm.dsp ndb/src/mgmclient/libndbmgmclient.dsp ndb/src/mgmsrv/ndb_mgmd.dsp ndb/src/ndbapi/libndbapi.dsp ndb/src/libndbclient.dsp ndb/test/ndbapi/flexBench.dsp ndb/test/ndbapi/testBasic.dsp ndb/test/ndbapi/testBlobs.dsp ndb/test/ndbapi/testScan.dsp ndb/test/src/libNDBT.dsp ndb/tools/ndb_waiter.dsp ndb/tools/ndb_drop_table.dsp ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_desc.dsp ndb/tools/ndb_drop_index.dsp ndb/tools/ndb_show_tables.dsp ndb/tools/ndb_select_all.dsp ndb/tools/ndb_select_count.dsp
2005-02-25 11:47:27 +01:00
unknown
0dcbd0704c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean


BitKeeper/etc/ignore:
  auto-union
2005-02-09 16:34:03 +04:00
unknown
93624f3c3d Fix for NCHAR bug appeared during the merging
BitKeeper/etc/ignore:
  Added libmysqld/my_decimal.cc to the ignore list
sql/sql_yacc.yy:
  Lex->dec initialization added
2005-02-09 16:32:43 +04:00
unknown
8daa51887d fixed C++ syntax in C code
fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory


BitKeeper/etc/ignore:
  Added libmysqld/my_decimal.cc to the ignore list
sql/my_decimal.cc:
  fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
strings/decimal.c:
  fixed C++ syntax in C code
2005-02-09 11:35:22 +02:00
unknown
91db48e35a Precision Math implementation
BitKeeper/etc/ignore:
  Added client/decimal.c client/my_decimal.cc client/my_decimal.h to the ignore list
2005-02-09 02:50:45 +04:00
unknown
63982db93c Better bugfix for "HAVING when refering to RAND()" (Bug #8216)
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()


BitKeeper/etc/ignore:
  added support-files/ndb-config-2-node.ini
mysql-test/r/group_by.result:
  More complicated test to assure that rand() is only calulated once
mysql-test/r/user_var.result:
  Back to old results :(  (ok but not perfect)
mysql-test/t/group_by.test:
  More complicated test to assure that rand() is only calulated once
sql/item.cc:
  Better bugfix for "HAVING when refering to RAND()"
  This will ensure that when refering to things like RAND() in HAVING through an alias we will not recalculate that rand() value in the HAVING part but use the value in the row
  Generalize split_sum_func()
sql/item.h:
  Better bugfix for "HAVING when refering to RAND()"
  T
sql/item_cmpfunc.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_func.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_row.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_strfunc.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/sql_list.h:
  Add functions to concatenate lists
sql/sql_select.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
  This will ensure that any reference to these has a valid value.
2005-02-08 14:41:09 +02:00
unknown
2984b0e4bd small testcase update
BitKeeper/etc/ignore:
  Added support-files/ndb-config-2-node.ini to the ignore list
2005-02-07 11:17:24 +01:00
unknown
5c3c40798d small Makefile.am cleanup
clean: targets removed
    generated *.h files moved to include/


Docs/Images/Makefile.am:
  no clean: targets please!
client/Makefile.am:
  generated *.h files moved to include/
extra/Makefile.am:
  generated *.h files moved to include/
include/Makefile.am:
  no clean: targets please!
libmysql/Makefile.am:
  generated *.h files moved to include/
libmysql_r/Makefile.am:
  generated *.h files moved to include/
libmysqld/Makefile.am:
  generated *.h files moved to include/
libmysqld/examples/Makefile.am:
  generated *.h files moved to include/
  no clean: target please!
ndb/docs/Makefile.am:
  no clean: targets please!
scripts/Makefile.am:
  SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
  generated *.h files moved to include/
sql/Makefile.am:
  generated *.h files moved to include/
sql/share/Makefile.am:
  instead of (incorrectly) duplicating comp_err command line,
  call do make in extra/
tools/Makefile.am:
  generated *.h files moved to include/
BitKeeper/etc/ignore:
  Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
2005-01-28 17:14:03 +01:00
unknown
5afe81ae61 merged
BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-25 21:11:04 +01:00
unknown
c2a2f5afb8 Cleanups during review
BitKeeper/etc/ignore:
  added libmysqld/examples/mysqltest_embedded
client/mysqlbinlog.cc:
  Call mysql_close() before die()
innobase/include/eval0eval.ic:
  Remove assert that fails on 64 bit machines
  (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU)
sql/mysqld.cc:
  Force lower_case_table_names to 0 if set to 2 on case insensitive file name
sql/sql_select.cc:
  Remove #if 0
2005-01-25 21:27:51 +02:00
unknown
c312cf2762 Merge
BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2005-01-24 13:48:48 -08:00
unknown
712f3f677b merged
mysql-test/t/ctype_cp932.test:
  Change mode to -rw-rw-r--
mysql-test/t/ctype_eucjpms.test:
  Change mode to -rw-rw-r--
BitKeeper/etc/ignore:
  Added libmysqld/ha_federated.cc to the ignore list
2005-01-24 21:30:21 +01:00
unknown
c03aaf85f2 - renamed client_test -> mysql_client_test
- renamed the tests that use the embedded server (client_test -> 
  mysql_client_test_embedded, mysqltest -> mysql_test_embedded
  and changed some Makefiles and scripts so they are installed in $bindir
  (required to be able to run the test suite against the embedded server)


tests/mysql_client_test.c:
  Rename: tests/client_test.c -> tests/mysql_client_test.c
libmysql/libmysql.c:
  - renamed client_test.c to mysql_client_test.c in a comment
libmysqld/examples/Makefile.am:
  - renamed client_test -> mysql_client_test_embedded
  - renamed mysqltest -> mysqltest_embedded
  - both will be installed in $bindir
scripts/make_binary_distribution.sh:
  - install mysql_client_test, mysql_client_test_embedded and mysqltest_embedded
    into bin directory
tests/Makefile.am:
  - renamed client_test to mysql_client_test
BitKeeper/etc/ignore:
  Added tests/mysql_client_test to the ignore list
2005-01-20 16:25:38 +01:00
unknown
2f246d2ff6 Merge with global tree
BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
configure.in:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
sql/sql_show.cc:
  No changes
strings/ctype-cp932.c:
  No changes
support-files/mysql.spec.sh:
  No changes
2005-01-15 14:39:16 +02:00
unknown
0cbd58c52b Merge with 4.1
BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
heap/hp_create.c:
  Auto merged
heap/hp_write.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/data/data0type.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Use local values
mysql-test/r/ps_1general.result:
  Update results
mysql-test/t/func_gconcat.test:
  no changes
mysql-test/t/ps_1general.test:
  Use local code
ndb/src/common/util/version.c:
  Use local code
sql/filesort.cc:
  Empty line changes
sql/ha_heap.cc:
  Merge
sql/item_timefunc.cc:
  Keep local code
sql/mysql_priv.h:
  Update to 5.0
sql/sql_show.cc:
  Hand merge
support-files/mysql.spec.sh:
  No changes
2005-01-15 14:09:45 +02:00
unknown
5168d25f35 Added ndb_types.h to ignore
BitKeeper/etc/ignore:
  added ndb/include/ndb_types.h
2005-01-15 12:36:20 +02:00
unknown
111587e9e3 Merge
BitKeeper/etc/ignore:
  auto-union
innobase/os/os0proc.c:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
extra/comp_err.c:
  SCCS merged
2005-01-13 19:14:10 +02:00
unknown
388cd3a7c4 Bug in InnoDB;
file closing in extra/comp_err.c


BitKeeper/etc/ignore:
  added extra/mysqld_ername.h
extra/comp_err.c:
  Added proper closing of the file.
innobase/os/os0proc.c:
  Fixed small bug in innodb.
2005-01-13 19:03:46 +02:00
unknown
382cc831de merged
BitKeeper/etc/ignore:
  auto-union
include/my_pthread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  merged manually
2005-01-06 19:32:16 +02:00
unknown
dd4a9fcbd3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
2005-01-06 17:36:48 +02:00
unknown
73c9909750 Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
innobase/row/row0upd.c:
  Trivial merge
mysql-test/t/func_concat.test:
  Keep local code
mysql-test/t/multi_update.test:
  auto merge
sql/ha_ndbcluster.cc:
  manual merge
sql/item_timefunc.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/sql_class.h:
  manual merge
sql/sql_delete.cc:
  manual merge
sql/sql_insert.cc:
  manual merge
sql/sql_lex.cc:
  manual merge
sql/sql_lex.h:
  manual merge
sql/sql_load.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/sql_update.cc:
  manual merge
2005-01-03 23:04:52 +02:00
unknown
82e5d5ef95 added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignore
BitKeeper/etc/ignore:
  added ndb/include/ndb_global.h ndb/include/ndb_version.h
2005-01-03 22:00:32 +02:00
unknown
8bf7b342bc WL#964
added sort of file names for all OS


BitKeeper/etc/ignore:
  Added mysql-test/mysql-test-run.log mysql-test/r/alter_table.err mysql-test/r/archive.err mysql-test/r/bdb-alter-table-1.err mysql-test/r/bdb-alter-table-2.err mysql-test/r/bdb-crash.err mysql-test/r/bdb-deadlock.err mysql-test/r/bdb.err mysql-test/r/bdb_cache.err mysql-test/r/client_test.err mysql-test/r/csv.err mysql-test/r/ctype_ucs.err mysql-test/r/derived.err mysql-test/r/exampledb.err mysql-test/r/func_encrypt.err mysql-test/r/isam.err mysql-test/r/lowercase_table2.err mysql-test/r/multi_update.err mysql-test/r/mysql_protocols.err mysql-test/r/mysqlbinlog.err mysql-test/r/mysqlbinlog2.err mysql-test/r/mysqldump.err mysql-test/r/mysqltest.err mysql-test/r/ndb_alter_table.err mysql-test/r/ndb_autodiscover.err mysql-test/r/ndb_autodiscover2.err mysql-test/r/ndb_basic.err mysql-test/r/ndb_blob.err mysql-test/r/ndb_cache.err mysql-test/r/ndb_charset.err mysql-test/r/ndb_index.err mysql-test/r/ndb_index_ordered.err mysql-test/r/ndb_index_unique.err mysql-test/r/ndb_insert.err mysql-test/r/ndb_limit.err m
mysql-test/mysql_test_run_new.c:
  added sort of file names for all OS
2005-01-03 18:37:08 +05:00
unknown
f116ac5cdd Clean up the handling of "server" and "client" directories, while still avoiding the double listing of
common directories in 'SUBDIRS' macro ("make distclean" had failed due to that).
Solves bug#7368: "regex make error in 4.1.8"


BitKeeper/etc/ignore:
  Added ndb/include/ndb_version.h ndb/include/ndb_global.h to the ignore list
Makefile.am:
  Build the 'SUBDIRS' list from the new variable 'sql_union_dirs', not the old "client" and "servers" lists which will overlap.
  That overlap worked for build runs, but it caused failures of 'make distclean' etc because the overlapping directories
  were cleaned twice which could not work.
  Solves bug#7368: "regex make error in 4.1.8"
configure.in:
  Introduce a new variable 'sql_union_dirs' to contain those directories which are needed for either server or client.
  This is needed to have complete "server" and "client" directory lists in 'Makefile' but prevent double listing
  in 'SUBDIRS' (see the comment for 'Makefile.am').
  Solves bug#7368: "regex make error in 4.1.8"
2004-12-30 14:03:19 +01:00
unknown
bb2d3eaa30 Merge with 4.1
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_base.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/password.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged
sql/udf_example.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
Makefile.am:
  Simple merge
client/mysqldump.c:
  Simple merge
configure.in:
  Simple merge
libmysqld/lib_sql.cc:
  Automatic merge
mysql-test/r/func_str.result:
  Automatic merge
mysql-test/r/grant.result:
  simple merge
mysql-test/r/multi_update.result:
  automatc merge
mysql-test/r/ps.result:
  automatic merge
mysql-test/r/ps_2myisam.result:
  Automatic merge
mysql-test/r/ps_3innodb.result:
  Automatic merge
mysql-test/r/ps_4heap.result:
  Automatic merge
mysql-test/r/ps_5merge.result:
  Automatic merge
mysql-test/r/ps_6bdb.result:
  Automatic merge
mysql-test/r/ps_7ndb.result:
  Automatic merge
mysql-test/r/show_check.result:
  Automatic merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/grant.test:
  Automatic merge
mysql-test/t/multi_update.test:
  Automatic merge
mysql-test/t/ps.test:
  Automatic merge
mysql-test/t/show_check.test:
  Automatic merge
ndb/docs/wl2077.txt:
  merge
ndb/src/mgmsrv/main.cpp:
  merge
scripts/mysql_fix_privilege_tables.sh:
  merge
sql/item.cc:
  Merge (difficult)
sql/item.h:
  simple merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Simple merge
sql/item_subselect.h:
  Automatic merge
sql/mysql_priv.h:
  Simple merge
sql/slave.h:
  Automatic merge
sql/sql_base.cc:
  Removed code that was backported to 4.1
sql/sql_class.h:
  Merge (some code moved to sql_insert.cc)
sql/sql_db.cc:
  simple merge
sql/sql_insert.cc:
  Merge (difficult as logic had changed both in 4.1 and 5.0)
  Some coded moved here from sql_class.h
sql/sql_parse.cc:
  Merge (difficult)
sql/sql_prepare.cc:
  Simple merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Simple merge
sql/sql_update.cc:
  Difficult merge because of different logic for multi-updates
sql/sql_yacc.yy:
  Simple merge
tests/client_test.c:
  Simple merge
2004-12-22 13:54:39 +02:00
unknown
820d68d903 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script


BitKeeper/etc/ignore:
  Added mysql-4.1.8-win-src.zip to the ignore list
VC++Files/client/mysqltest.dsp:
  corrected dsp file
VC++Files/mysql-test/mysql_test_run_new.dsp:
  corrected mysql_test_run_new.dsp
VC++Files/mysql.dsw:
  added dependency
  corrected path of mysql_test_run_new.dsp
client/mysqltest.c:
  fixed wrong code
mysql-test/Makefile.am:
  added my_create_tables.c
mysql-test/my_manage.c:
  removed command_line
  fixed #elif
mysql-test/my_manage.h:
  restored NAME_MAX and MAX_FNAME
mysql-test/mysql_test_run_new.c:
  added create_system_files()
  added compare for windows
scripts/make_win_src_distribution.sh:
  added all files of testes
  added mysql-test
2004-12-14 18:46:55 +05:00
unknown
0a09408da2 Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug;
BitKeeper/etc/ignore:
  added extra/created_include_files
extra/Makefile.am:
  Make sure that mysqld_error.h and sql_state.h are not build in the same time.
extra/comp_err.c:
  Fixed segfault bug
libmysqld/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
libmysqld/examples/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
scripts/make_win_src_distribution.sh:
  Windows version fix
2004-12-14 01:54:16 +02:00
unknown
51c2c581f1 Added missing errmsg.txt
BitKeeper/etc/ignore:
  added extra/sql_state.h
2004-12-13 23:28:24 +02:00
unknown
f7ef17dda1 merge
BitKeeper/etc/ignore:
  auto-union
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2004-12-09 04:22:28 +03:00
unknown
5c7949af6b Fix for a bug #6996
BitKeeper/etc/ignore:
  Added analyse.test client/mysqladmin.c to the ignore list
libmysql/libmysql.c:
  Fix for a bug #6996
  
  This fix enables that after all rows are read from a buffered result,
  mysql_stmt_data_seek(stmt,0) can rewind a counter to the beginning,
  so that rows can be re-fetched.
tests/client_test.c:
  Addition of a test for fix of the bug #6996 in client_test.c
2004-12-07 19:12:29 +02:00
unknown
796bd7de96 Merge with 4.1
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/lowercase_table3.result:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/log_event.cc:
  Merge with 4.1
  Trivial cleanup
2004-12-06 11:38:56 +02:00
unknown
d3c5c4997c Fixes to make mysql-test-run --embedded-server working
mysql-test/mysql-test-run.sh:
  Tests that can't be fixed now showed in the ignore-list
mysql-test/r/query_cache.result.es:
  test result renewed
mysql-test/r/select.result.es:
  test result renewed
mysql-test/r/type_blob.result.es:
  test result renewed
mysql-test/r/type_float.result.es:
  test result renewed
sql/sql_prepare.cc:
  time values sending fixed
tests/client_test.c:
  that doesnt work in embedded server
BitKeeper/etc/ignore:
  Added libmysqld/ha_archive.cc libmysqld/ha_example.cc libmysqld/ha_tina.cc to the ignore list
2004-12-02 16:08:17 +04:00
unknown
7730590080 - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds
BitKeeper/etc/ignore:
  Added ac_available_languages_fragment to the ignore list
2004-11-22 17:08:06 +01:00
unknown
7b0069ee20 merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2004-11-20 18:36:41 +01:00
unknown
ac9891722a ignore fix 2004-11-19 09:38:41 +00:00
unknown
b140e465f4 added to ignore list
BitKeeper/etc/ignore:
  added ../ndb/tools/ndb_restore
2004-11-19 09:35:12 +00:00
unknown
7d8f33eaf7 Fixed one warning and two errors reported by VC 6.0.
BitKeeper/etc/ignore:
  Added ndb/tools/ndb_restore to the ignore list
sql/item.cc:
  Fixed VC 6.0 warning:
  mysql-5.0.2-alpha\sql\item.cpp(1729) : warning C4715: 'resolve_ref_in_select_and_group' : not all control paths return a value
sql/opt_range.cc:
  Fixed VC 6.0 errors:
  ERROR # 4: mysql-5.0.2-alpha\sql\opt_range.cpp(8070) : error C2664: 'key_cmp' : cannot convert parameter 2 from 'char *' to 'const unsigned char *'
          Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
  
  ERROR # 5: mysql-5.0.2-alpha\sql\opt_range.cpp(8196) : error C2664: 'key_cmp' : cannot convert parameter 2 from 'char *' to 'const unsigned char *'
          Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
2004-11-18 11:24:18 +02:00
unknown
906d871d12 don't delete ac_available_languages_fragment in configure - it may be needed later
BitKeeper/etc/ignore:
  added ac_available_languages_fragment
2004-11-16 16:52:29 +01:00
unknown
03d82a4652 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_dbug.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_isam.cc:
  Auto merged
sql/ha_isammrg.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-11-15 19:27:06 +01:00
unknown
4d0e9ad917 Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-11-11 18:58:57 -08:00
unknown
f200533b3e Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-11-11 13:44:10 +01:00
unknown
96bd70c775 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
sql/item_subselect.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2004-11-09 21:47:46 +02:00
unknown
67ce88fc48 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  added ndb/tools/ndb_test_platform
2004-11-09 21:45:36 +02:00