mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30923 commits 2784 branches 343 tags 1.6 GiB
Commit graph

403 commits

Author SHA1 Message Date
unknown
17f3f28a8f Merge perch.ndb.mysql.com:/home/jonas/src/51-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2006-01-17 10:48:48 +01:00
unknown
788521526a ndb - merge all blocks into one lib, enables better parallell build 
(since am cant build directories in parallell)


BitKeeper/deleted/.del-Makefile.am~661a7e944c6a2048:
  Delete: storage/ndb/src/kernel/blocks/dbacc/Makefile.am
BitKeeper/deleted/.del-Makefile.am~7062fe587bbd7db4:
  Delete: storage/ndb/src/kernel/blocks/cmvmi/Makefile.am
BitKeeper/deleted/.del-Makefile.am~b7531a4ddc688658:
  Delete: storage/ndb/src/kernel/blocks/dbtux/Makefile.am
BitKeeper/deleted/.del-Makefile.am~e06c16d4515a6ce6:
  Delete: storage/ndb/src/kernel/blocks/dbtc/Makefile.am
BitKeeper/deleted/.del-Makefile.am~1f16f5bcb0850b40:
  Delete: storage/ndb/src/kernel/blocks/qmgr/Makefile.am
BitKeeper/deleted/.del-Makefile.am~2446a572de707944:
  Delete: storage/ndb/src/kernel/blocks/trix/Makefile.am
BitKeeper/deleted/.del-Makefile.am~51344ef8d0bbc561:
  Delete: storage/ndb/src/kernel/blocks/suma/Makefile.am
BitKeeper/deleted/.del-Makefile.am~c65b52fdd2143330:
  Delete: storage/ndb/src/kernel/blocks/ndbfs/Makefile.am
BitKeeper/deleted/.del-Makefile.am~c9ae371812ceaf68:
  Delete: storage/ndb/src/kernel/blocks/dbutil/Makefile.am
BitKeeper/deleted/.del-Makefile.am~e1b9fbc3d07a629d:
  Delete: storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am
storage/ndb/src/kernel/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/backup/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Merge all blocks into one lib
 2006-01-17 09:32:16 +01:00
unknown
6f83ed91f3 WL #2747: Fix such that backup and restore works for user defined 
partitioned tables in NDB


include/my_sys.h:
  Move packfrm and unpackfrm to mysys
mysql-test/r/ndb_restore.result:
  New test cases
mysql-test/t/ndb_restore.test:
  New test cases
mysys/my_compress.c:
  Moved packfrm and unpackfrm to mysys
sql/ha_ndbcluster.cc:
  Set value of partition function in hidden field for user defined
  partitioning in NDB to handle restore and later on-line reorganize
  of partitions
  To save space value of those functions are limited to 32 bits
sql/ha_partition.cc:
  Use new get_partition_id interface
sql/handler.h:
  Use new get_partition_id interface
sql/mysql_priv.h:
  Moved to mysys
sql/mysqld.cc:
  Minor
sql/opt_range.cc:
  New get_partition_id interface
sql/sql_partition.cc:
  New get_partition_id interface
  Fix error checks of specification of engines in ALTER TABLE
  Moved packfrm and unpackfrm to mysys
sql/sql_table.cc:
  Fixed debug printouts
storage/ndb/include/kernel/ndb_limits.h:
  New constant
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  New table description item
storage/ndb/include/ndb_version.h.in:
  New version specific constant
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  New item in table descriptions
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  New item in table descriptions
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Write fragment id in backup's log entry
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Write fragment id in backup's log entry
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  New item in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  New item in table description
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Moved constant
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  New item in table description
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  New item in table description
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  New item in table description
storage/ndb/tools/Makefile.am:
  Compress library needed for ndb_restore
storage/ndb/tools/restore/Restore.cpp:
  Handle fragment id and also handle backups from older versions
storage/ndb/tools/restore/Restore.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer_printer.cpp:
  Use fragment id
storage/ndb/tools/restore/consumer_printer.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer_restore.cpp:
  Code to map node groups if new cluster has different set of
  node groups from original cluster
  Very simple search and replace parser of partition syntax in frm file
  Fix settings of partition id properly using fragment id and hidden
  field in tables
storage/ndb/tools/restore/consumer_restore.hpp:
  Changed function headers and new one for mapping node groups
storage/ndb/tools/restore/consumer_restorem.cpp:
  Use fragment id
storage/ndb/tools/restore/restore_main.cpp:
  New parameter to set node group map, parser for this parameter
 2006-01-17 09:25:12 +01:00
unknown
19bbb7cc85 WL #2604: Partition Management 
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes


include/thr_lock.h:
  New method to downgrade locks from TL_WRITE_ONLY
  Possibility to upgrade lock while aborting locks
mysql-test/r/ndb_autodiscover.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_bitfield.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_gis.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/r/partition.result:
  New test case
mysql-test/r/partition_error.result:
  New test case
mysql-test/r/partition_mgm_err.result:
  Fix of test case results
mysql-test/t/disabled.def:
  partition_03ndb still has bug
mysql-test/t/ndb_partition_key.test:
  New test cases for new functionality and bugs
mysql-test/t/partition.test:
  New test cases for new functionality and bugs
mysql-test/t/partition_error.test:
  New test cases for new functionality and bugs
mysql-test/t/partition_mgm_err.test:
  New test cases for new functionality and bugs
mysys/thr_lock.c:
  New method to downgrade TL_WRITE_ONLY locks
  Possibility to specify if locks are to be upgraded at abort locks
sql/ha_archive.cc:
  New handlerton methods
sql/ha_berkeley.cc:
  New handlerton methods
sql/ha_blackhole.cc:
  New handlerton methods
sql/ha_federated.cc:
  New handlerton methods
sql/ha_heap.cc:
  New handlerton methods
sql/ha_innodb.cc:
  New handlerton methods
sql/ha_myisam.cc:
  New handlerton methods
sql/ha_myisammrg.cc:
  New handlerton methods
sql/ha_ndbcluster.cc:
  New handlerton methods
  Moved out packfrm and unpackfrm methods
  Adapted many parts to use table_share instead of table->s
  Ensured that .ndb file uses filename and not tablename
  according to new encoding of names (WL 1324)
  All NDB tables are partitioned and set up partition info
  Fixed such that tablenames use tablenames and not filenames in NDB
  NDB uses auto partitioning for ENGINE=NDB tables
  Warning for very large tables
  Set RANGE data
  Set LIST data
  New method to set-up partition info
  Set Default number of partitions flag
  Set linear hash flag
  Set node group array
  Set number of fragments
  Set max rows
  Set tablespace names
  New method to get number of partitions of table to use at open table
sql/ha_ndbcluster.h:
  Removed partition_flags and alter_table_flags from handler class
  A couple of new and changed method headers
sql/ha_ndbcluster_binlog.cc:
  Use new method headers
sql/ha_partition.cc:
  New handlerton methods
  Lots of new function headers
  Use #P# as separator between table name and partition name and
  #SP# as separator between partition name and subpartition name
  Use filename encoding for files both of table name part and of
  partition name parts
  New method to drop partitions based on partition state
  New method to rename partitions based on partition state
  New methods to optimize, analyze, check and repair partitions
  New methods to optimize, analyze, check and repair table
  Helper method to create new partition, open it and external lock
  it, not needed to lock it internally since no one else knows about
  it yet.
  Cleanup method at error for new partitions
  New methods to perform bulk of work at ADD/REORGANIZE partitions
  (change_partitions, copy_partitions)
sql/ha_partition.h:
  New methods and variables
  A few dropped ones and a few changed ones
sql/handler.cc:
  Handlerton interface changes
  New flag to open_table_from_share
sql/handler.h:
  New alter_table_flags
  New partition flags
  New partition states
  More states for default handling
  Lots of new, dropped and changed interfaces
sql/lex.h:
  Added REBUILD and changed name of REORGANISE to REORGANIZE
sql/lock.cc:
  Method to downgrade locks
  Able to specify if locks upgraded on abort locks
sql/log.cc:
  New handlerton methods
sql/mysql_priv.h:
  Lots of new interfaces
sql/share/errmsg.txt:
  Lots of new, dropped and changed error messages
sql/sql_base.cc:
  Adapted to new method headers
  New method to abort and upgrade lock
  New method to close open tables and downgrade lock
  New method to wait for completed table
sql/sql_lex.h:
  New flags
sql/sql_partition.cc:
  Return int instead of bool in get_partition_id
  More defaults handling
  Make use of new mem_alloc_error method
  More work on function headers
  Changes to generate partition syntax to cater for intermediate
  partition states
  Lots of new code with large comments describing new features for
  Partition Management:
  ADD/DROP/REORGANIZE/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
sql/sql_show.cc:
  Minors
sql/sql_table.cc:
  Moved a couple of methods
  New methods to copy create lists and key lists
  for use with mysql_prepare_table
  New method to write frm file
  New handling of handlers with auto partitioning
  Fix CREATE TABLE LIKE
  Moved code for ADD/DROP/REORGANIZE partitions
  Use handlerton method for alter_table_flags
sql/sql_yacc.yy:
  More memory alloc error checks
  New syntax for REBUILD, ANALYZE, CHECK, OPTIMIZE, REPAIR partitions
sql/table.cc:
  Fix length of extra part to be 4 bytes
  Partition state introduced in frm file
sql/table.h:
  Partition state introduced
sql/unireg.cc:
  Partition state introduced
  Default partition
storage/csv/ha_tina.cc:
  New handlerton methods
storage/example/ha_example.cc:
  New handlerton methods
storage/ndb/include/kernel/ndb_limits.h:
  RANGE DATA
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  New interfaces in ALTER TABLE towards NDB kernel
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
  New section
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Lots of new parts of table description
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  tablespace id specified in LQHFRAGREQ
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Lots of new methods in NDB dictionary
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New error insertion
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  a few extra jam's
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Changes to definition of blob tables
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Lots of new stuff in NDB dictionary
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Lots of new stuff in NDB dictionary
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Lots of new stuff in NDB dictionary
storage/ndb/test/ndbapi/test_event.cpp:
  removed use of methods no longer in existence
storage/ndb/tools/restore/Restore.cpp:
  Renamed variable
 2006-01-17 08:40:00 +01:00
unknown
ed96f70849 added assert for when ndb share is not released as it should 
+ corrected the bugs in this resuling from mysql-test-run
+removed some debug printouts


sql/ha_ndbcluster.cc:
  added assert for when ndb share is not released as it should
  + corrected the bugs in this resuling from mysql-test-run
sql/ha_ndbcluster.h:
  added assert for when ndb share is not released as it should
  + corrected the bugs in this resuling from mysql-test-run
sql/ha_ndbcluster_binlog.cc:
  added assert for when ndb share is not released as it should
  + corrected the bugs in this resuling from mysql-test-run
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  removed some debug printouts
 2006-01-17 07:36:50 +01:00
unknown
6c83ba5c48 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  april.(none):/home/svoj/devel/mysql/BUG14194/mysql-5.1-new


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
 2006-01-16 22:27:36 +04:00
unknown
167e017cb6 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into moonbone.local:/work/15347-bug-5.1-new-mysql


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2006-01-16 19:01:57 +03:00
unknown
048754ff46 only use "public" types in plugin API 
include/plugin.h:
  only use "public" types in plugin API:
  s/uint/unsigned int/ or s/uint/int/
  s/bool/char/
  s/byte/char/
  s/CHARSET_INFO */struct charset_info_st */
 2006-01-16 15:17:45 +01:00
unknown
9422fee7de Manually merged 
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/os/os0thread.c:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
 2006-01-16 16:57:15 +03:00
unknown
0a5a8a51f2 ndb - fix ndb_restore on solaris 
Fix alignment changes in tup page header


storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp:
  Fix alignment changes in tup page header
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Fix alignment changes in tup page header
 2006-01-15 20:45:10 +01:00
unknown
ec67a6a3eb Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/51-new
 2006-01-15 20:45:09 +01:00
unknown
ebf577974e ndb dd - 
Change default page buffer cache size


mysql-test/ndb/ndb_config_1_node.ini:
  Add configuration of page buffer
mysql-test/ndb/ndb_config_2_node.ini:
  Add configuration of page buffer
mysql-test/ndb/ndb_config_4_node.ini:
  Add configuration of page buffer
mysql-test/ndb/ndbcluster.sh:
  Add configuration of page buffer
storage/ndb/include/kernel/ndb_limits.h:
  Hard code some limits (for now)...
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add configuration of page buffer
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add configuration of page buffer
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add configuration of page buffer
storage/ndb/src/kernel/blocks/restore.cpp:
  Add configuration of page buffer
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Change default page buffer caches from 1M (only used for testing) to realistic 64M
 2006-01-15 20:45:08 +01:00
unknown
0892c0f5fe Windows/Visual Studio 2003 fixes for the 5.1.5 release. 2006-01-13 22:09:48 +01:00
unknown
ca4935e6ea BUG#14194: Problem with fulltext boolean search and apostrophe 
Fixed that single apostrophe was considered as a word character.


mysql-test/r/fulltext.result:
  A test case for BUG#14194 added.
mysql-test/t/fulltext.test:
  A test case for BUG#14194 added.
storage/myisam/ftdefs.h:
  Fixed that single apostrophe was considered as a word character.
 2006-01-13 23:34:38 +04:00
unknown
0953c40faa ndb - wl#2972 event merge false by default => change option name 
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  event merge false by default => change option name
storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp:
  event merge false by default => change option name
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  event merge false by default => change option name
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  event merge false by default => change option name
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  event merge false by default => change option name
storage/ndb/test/ndbapi/test_event.cpp:
  event merge false by default => change option name
storage/ndb/test/ndbapi/test_event_merge.cpp:
  event merge false by default => change option name
 2006-01-13 18:02:43 +01:00
unknown
da0db88b45 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/include/util/Bitmask.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  merge
mysql-test/t/ndb_bitfield.test:
  merge
 2006-01-13 09:22:02 +01:00
unknown
c8af5096ed Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


sql/event.h:
  Auto merged
 2006-01-13 07:50:46 +01:00
unknown
9764d01258 ndb - mysql-5.1-wl2325-v7 quick fix 
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  separate events as default + typos
 2006-01-13 00:22:16 +01:00
unknown
4c798b42d3 wl2325 wl2324 
mysql-test/include/have_ndb_extra.inc:
  New BitKeeper file ``mysql-test/include/have_ndb_extra.inc''
mysql-test/include/not_ndb.inc:
  New BitKeeper file ``mysql-test/include/not_ndb.inc''
mysql-test/r/have_ndb_extra.require:
  New BitKeeper file ``mysql-test/r/have_ndb_extra.require''
mysql-test/r/ndb_alter_table_row.result:
  New BitKeeper file ``mysql-test/r/ndb_alter_table_row.result''
mysql-test/r/ndb_alter_table_stm.result:
  New BitKeeper file ``mysql-test/r/ndb_alter_table_stm.result''
mysql-test/r/ndb_binlog_basic.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_basic.result''
mysql-test/r/ndb_binlog_multi.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_multi.result''
mysql-test/r/ndb_multi_row.result:
  New BitKeeper file ``mysql-test/r/ndb_multi_row.result''
mysql-test/r/not_ndb.require:
  New BitKeeper file ``mysql-test/r/not_ndb.require''
mysql-test/r/rpl_ndb_bank.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_bank.result''
mysql-test/r/rpl_ndb_basic.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_basic.result''
mysql-test/r/rpl_ndb_disk.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_disk.result''
mysql-test/r/rpl_ndb_idempotent.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_idempotent.result''
mysql-test/r/rpl_ndb_load.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_load.result''
mysql-test/r/rpl_ndb_multi.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_multi.result''
mysql-test/r/rpl_ndb_sync.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_sync.result''
mysql-test/r/rpl_row_basic_7ndb.result:
  New BitKeeper file ``mysql-test/r/rpl_row_basic_7ndb.result''
mysql-test/t/ndb_alter_table_row.test:
  New BitKeeper file ``mysql-test/t/ndb_alter_table_row.test''
mysql-test/t/ndb_alter_table_stm.test:
  New BitKeeper file ``mysql-test/t/ndb_alter_table_stm.test''
mysql-test/t/ndb_binlog_basic.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_basic.test''
mysql-test/t/ndb_binlog_multi.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_multi.test''
mysql-test/t/ndb_multi_row.test:
  New BitKeeper file ``mysql-test/t/ndb_multi_row.test''
mysql-test/t/rpl_ndb_bank.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_bank.test''
mysql-test/t/rpl_ndb_basic.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_basic.test''
mysql-test/t/rpl_ndb_disk.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_disk.test''
mysql-test/t/rpl_ndb_idempotent.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_idempotent.test''
mysql-test/t/rpl_ndb_load.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_load.test''
mysql-test/t/rpl_ndb_multi.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_multi.test''
mysql-test/t/rpl_ndb_sync.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_sync.test''
mysql-test/t/rpl_row_basic_7ndb.test:
  New BitKeeper file ``mysql-test/t/rpl_row_basic_7ndb.test''
sql/ha_ndbcluster_binlog.cc:
  New BitKeeper file ``sql/ha_ndbcluster_binlog.cc''
sql/ha_ndbcluster_binlog.h:
  New BitKeeper file ``sql/ha_ndbcluster_binlog.h''
sql/ha_ndbcluster_tables.h:
  New BitKeeper file ``sql/ha_ndbcluster_tables.h''
sql/rpl_injector.cc:
  New BitKeeper file ``sql/rpl_injector.cc''
sql/rpl_injector.h:
  New BitKeeper file ``sql/rpl_injector.h''
storage/ndb/include/kernel/signaldata/DihFragCount.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DihFragCount.hpp''
 2006-01-12 19:51:02 +01:00
unknown
bc8726cbd5 Merge perch.ndb.mysql.com:/home/jonas/src/51-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2006-01-12 17:04:57 +01:00
unknown
526072c750 Merge perch.ndb.mysql.com:/home/jonas/src/51-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2006-01-12 16:59:27 +01:00
unknown
ead6d8af02 ndb - 
Fix partial SR


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix partial SR
 2006-01-12 16:58:41 +01:00
unknown
7e1ea97a5a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-01-12 16:43:51 +01:00
unknown
c126958fdc ndb - wl#2972 tiny bugfix 
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  bugfix
storage/ndb/test/ndbapi/test_event_merge.cpp:
  continue
 2006-01-12 16:34:57 +01:00
unknown
f8d126a059 Sun compiler fixes. 
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add missing return value, otherwise Sun compiler complains.
 2006-01-12 15:40:38 +01:00
unknown
45f3e9ec3f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-new
 2006-01-12 11:31:51 +01:00
unknown
a5ac8675b5 ndb_dd_ddl - fix bug 
BitKeeper/deleted/.del-ndb_error_reporter~48c84ad377571240:
  Delete: ndb/tools/ndb_error_reporter
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Release file from hash
 2006-01-12 11:30:17 +01:00
unknown
9c446eadbe ndb - 
fix Suma get buffer ptr, adopt to new page pool in tup


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix new page pool usage
    previously it accepted page = base + RNIL, since it didnt use page anyway, sort of a prefetch...
 2006-01-12 10:48:36 +01:00
unknown
264df6d02a Merge mysql.com:/space/pekka/ndb/version/my51 
into  mysql.com:/space/pekka/ndb/version/my51-rbr


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
 2006-01-12 00:17:11 +01:00
unknown
35c2846c5c ndb - wl#2972 (5.1, related) detached trigger fixes for multiops 
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  detached trigger fixes for multiops
storage/ndb/test/ndbapi/test_event_merge.cpp:
  detached trigger fixes for multiops
 2006-01-11 23:51:18 +01:00
unknown
ca5f559464 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-01-11 13:06:20 +01:00
unknown
5c4a94b903 Fix handlerton alter_tablespace for example storage engine 2006-01-11 12:39:09 +01:00
unknown
641ce5e97e wl2723 - ndb opt. nr 
mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
 2006-01-11 11:35:25 +01:00
unknown
53212ec5f5 Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix 
into  mysql.com:/usr/local/mysql/mysql-5.1-new


storage/ndb/src/common/portlib/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
storage/ndb/config/common.mk.am:
  Manual merge.
 2006-01-11 09:21:11 +01:00
unknown
aa9b00a3d3 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-01-09 01:19:37 +01:00
unknown
c663d045fa Some header files were missing from "make dist". 2006-01-05 14:17:05 +01:00
unknown
2e253c1ed8 Merge mysql.com:/space/pekka/ndb/version/my51 
into  mysql.com:/space/pekka/ndb/version/my51-rbr


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
 2006-01-02 09:58:59 +01:00
unknown
03ad9cb577 Do not use C++ style comments (//) in C source (breaks compilation on aix52). 2006-01-02 09:58:58 +01:00
unknown
67a6dd9fb9 Do not use C++ style comments (//) in C source (breaks compilation on aix52). 2006-01-02 02:45:26 +01:00
unknown
d7901a2afe Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/export/space/pekka/ndb/version/my51
 2006-01-01 21:50:29 +01:00
unknown
758860dd77 ndb - wl#2972 (5.1) fix detached trigger opType 
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  set non-update pk pre data to UNDEFINED (previously unspecified)
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix detached trigger opType
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  fix detached trigger opType
storage/ndb/test/ndbapi/test_event_merge.cpp:
  exact verif post/pre data
 2006-01-01 21:48:26 +01:00
unknown
9c7412cae8 WL#1324 table name to file name encoding 
- Encoding itself, implemented as a charset
  "filename". Originally planned to use '.'
  as an escape character, but now changed to '@'
  for two reasons: "ls" does not return
  file names starting with '.' considering them
  as a kind of hidden files; some platforms
  do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
  strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
  an extention rather that replace it.
- Replacing all numeric constants in fn_format
  flag arguments to their mysys definitions, e.g.
  MY_UNPACK_FILENAME,
- Predictability in several function/methods:
  when a table name can appear with or withot .frm
  extension. Some functions/methods were changed
  so accept names strictly with .frm, other - strictly
  without .frm extensions. Several DBUG_ASSERTs were
  added to check whether an extension is passed.
Many files:
  table name to file name encoding
mysql_priv.h:
  Prototypes for new table name encoding tools.
ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
row0mysql.c:
  Fixing table name prefix.
mf_format.c:
  Adding MY_APPEND_EXT processing.
Many files:
  Fixing tests.
my_sys.h:
  Adding new flag to append rather than replace an extension.
m_ctype.h:
  Adding "filename" charset definition.


include/m_ctype.h:
  Adding "filename" charset definition.
include/my_sys.h:
  Adding new flag to append rather than replace an extension.
mysql-test/t/alter_table.test:
  Fixing tests.
mysql-test/t/create.test:
  Fixing tests.
mysql-test/t/show_check.test:
  Fixing tests.
mysql-test/r/alter_table.result:
  Fixing tests.
mysql-test/r/create.result:
  Fixing tests.
mysql-test/r/mysqldump.result:
  Fixing tests.
mysys/mf_format.c:
  Adding MY_APPEND_EXT processing.
sql/discover.cc:
  table name to file name encoding
sql/ha_berkeley.cc:
  table name to file name encoding
sql/ha_innodb.cc:
  table name to file name encoding
sql/ha_myisam.cc:
  table name to file name encoding
sql/ha_myisammrg.cc:
  table name to file name encoding
sql/ha_ndbcluster.cc:
  table name to file name encoding
sql/ha_partition.cc:
  table name to file name encoding
sql/handler.cc:
  table name to file name encoding.
sql/init.cc:
  table name to file name encoding
sql/mysqld.cc:
  table name to file name encoding
sql/parse_file.cc:
  table name to file name encoding
sql/sql_acl.cc:
  table name to file name encoding
sql/sql_base.cc:
  table name to file name encoding
sql/sql_db.cc:
  table name to file name encoding
sql/sql_delete.cc:
  table name to file name encoding
sql/sql_rename.cc:
  table name to file name encoding
sql/sql_show.cc:
  table name to file name encoding
sql/sql_table.cc:
  table name to file name encoding
sql/sql_trigger.cc:
  table name to file name encoding
sql/sql_view.cc:
  table name to file name encoding
sql/strfunc.cc:
  table name to file name encoding
sql/table.cc:
  table name to file name encoding
sql/unireg.cc:
  table name to file name encoding
storage/innobase/row/row0mysql.c:
  Fixing table name prefix.
  ,
storage/myisam/mi_create.c:
  table name to file name encoding
storage/myisam/mi_delete_table.c:
  table name to file name encoding
storage/myisam/mi_open.c:
  table name to file name encoding
storage/myisam/mi_rename.c:
  table name to file name encoding
strings/ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
sql/mysql_priv.h:
  Prototypes for new table name encoding tools.
storage/myisammrg/myrg_create.c:
  table name to file name encoding
storage/myisammrg/myrg_open.c:
  table name to file name encoding
 2005-12-31 09:01:26 +04:00
unknown
38005eae6a WL#2575 - Fulltext: Parser plugin for FTS 
Manual merge.


Makefile.am:
  Added new 'plugin' subdir.
configure.in:
  Added plugin related makefiles.
include/my_base.h:
  Added HA_OPEN_FROM_SQL_LAYER flag - indicates that a table was openned from the sql layer.
  Added HA_OPTION_RELIES_ON_SQL_LAYER flag - indicates that a table relies on the sql layer.
  Added HA_CREATE_RELIES_ON_SQL_LAYER flag - indicates that a table must be created with
  HA_OPTION_RELIES_ON_SQL_LAYER flag.
include/myisam.h:
  Distinct fulltext parser number added.
include/plugin.h:
  Revise comment.
sql/ha_myisam.cc:
  Pass HA_OPEN_FROM_SQL_LAYER flag to mi_open().
  Pass HA_CREATE_RELIES_ON_SQL_LAYER flag to mi_create().
sql/sql_plugin.cc:
  Reuse "unused" dynamic array elements.
  A check for plugin info interface version.
sql/sql_plugin.h:
  Added plugin_type_names[] - string plugin type names.
sql/sql_show.cc:
  Use plugin_type_names array instead of switch to find literal parser name representation.
sql/sql_table.cc:
  Fixed that ALTER TABLE ... ADD INDEX loses WITH PARSER info.
storage/myisam/ft_boolean_search.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to parser->parse().
storage/myisam/ft_nlq_search.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to parser->parse().
storage/myisam/ft_parser.c:
  Added two functions:
  ftparser_call_initializer() - calls parser->init() function if specified and parser is not yet
  initialized. Returns MYSQL_FTPARSER_PARAM *.
  ftparser_call_deinitializer() - calls parser->deinit() function if specified and parser was
  initialized. Deinitializes all parsers.
  ft_parse() accepts additional param now - MYSQL_FTPARSER_PARM and passes it to parser->parse().
storage/myisam/ft_update.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to _mi_ft_parse().
  _mi_ft_parse() accepts additional param now - MYSQL_FTPARSER_PARAM and passes
  it to parser->parse().
storage/myisam/ftdefs.h:
  Prototypes for new functions were added. MYSQL_FTPARSER_PARAM was added
  to ft_parse and _mi_ft_parse().
storage/myisam/mi_close.c:
  Free ftparser_param allocated by ftparser_call_initializer().
storage/myisam/mi_create.c:
  If a table relies on the sql layer, set HA_OPTION_RELIES_ON_SQL_LAYER.
storage/myisam/mi_locking.c:
  Call deinitializer for each initialized parser.
storage/myisam/mi_open.c:
  Set default values for share->ftparser and keydef->ftparser_nr.
  If a table is openned from the non-sql layer and HA_OPTION_RELIES_ON_SQL_LAYER is set, raise
  HA_ERR_UNSUPPORTED error.
storage/myisam/myisamdef.h:
  Added number of distinct parsers to MYISAM_SHARE.
  Added ftparser_param to MI_INFO.
plugin/Makefile.am:
  New BitKeeper file ``plugin/Makefile.am''
plugin/fulltext/Makefile.am:
  New BitKeeper file ``plugin/fulltext/Makefile.am''
plugin/fulltext/plugin_example.c:
  New BitKeeper file ``plugin/fulltext/plugin_example.c''
 2005-12-28 16:05:30 +04:00
unknown
a102804378 Merge mysql.com:/space/pekka/ndb/version/my51 
into  mysql.com:/space/pekka/ndb/version/my51-rbr


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
 2005-12-28 11:09:06 +01:00
unknown
5bfbfb24e5 build fixes for azio on systems without zutil.h 
storage/archive/azio.c:
  Build fixes for not having zutil.h
  
  use memset instead of zmemzero.
  
  use 8 as memory usage level (the default, which we were using anyway)
  
  in the .gz header, just say we're UNIX.
  
  use memcpy instead of zmemcpy.
storage/archive/azlib.h:
  don't use zutil.h, it's private to zlib
 2005-12-28 15:33:48 +11:00
unknown
94cbe6fd29 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new


client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
strings/decimal.c:
  Auto merged
configure.in:
  remove 5.0 version increement
sql/ha_archive.cc:
  merge
sql/handler.cc:
  merge
sql/mysqld.cc:
  merge
 2005-12-28 13:55:59 +11:00
unknown
581750330b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/antony/work2/p4-bug15976
 2005-12-27 11:15:56 -08:00
unknown
fe62853ad0 ndb - post merge fix 
storage/ndb/test/ndbapi/test_event_merge.cpp:
  Rename: ndb/test/ndbapi/test_event_merge.cpp -> storage/ndb/test/ndbapi/test_event_merge.cpp
storage/ndb/test/ndbapi/Makefile.am:
  post-merge fix
 2005-12-27 18:47:56 +01:00
unknown
4019cbf602 Bug#15976: Multiply warnings about unfreed memory 
leaks caused by Archive storage engine not closing files and
  storage engines not receiving panic() during shutdown


sql/ha_archive.cc:
  surplus my_close() call not neccessary as azclose() should work
sql/mysqld.cc:
  Make sure storage engines get panic() call by moving it before plugin_free()
storage/archive/azio.c:
  typo perhaps. azio was not closing files.
 2005-12-25 03:29:49 -08:00
unknown
eff9369d10 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
 2005-12-24 20:13:51 +03:00
unknown
81ca15813b Just a few cleanup points in azio. Should solve Ubuntu compile problem. 
storage/archive/azio.c:
  Cleanup.
storage/archive/azlib.h:
  Moved include lines about.
 2005-12-23 17:51:14 -08:00
unknown
64db2ba40d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2005-12-23 12:25:56 -08:00
unknown
8ff680920a Fix for Antony's push. I've also changed from using the zlib off_t pointer type to my_off_t to fix issues around buggy zlib versions and to make sure file sizes are consistent through out mysql. 
mysql-test/r/information_schema.result:
  Fix for Antony adding plugins to information schema.
sql/ha_archive.cc:
  Fix for now using my_off_t, no need to worry about buggy zlib's anymore.
sql/ha_archive.h:
  Update to fix issues with buggy zlib.
storage/archive/azio.c:
  Moved to using my_off_t (which should fix problems with most fille system size issues).
storage/archive/azlib.h:
  Change to using my_off_t
 2005-12-23 12:22:31 -08:00
unknown
6a6e9a1fac storage/bdb/dist/s_all 
When not generating 'tags' file, also don't generate symlinks to it (or make dist will fail/behave wierdly).
(origin:   1.1985 05/12/22 23:31:15 knielsen@mysql.com +1 -0)


storage/bdb/dist/s_all:
  When not generating 'tags' file, also don't generate symlinks to it (or make dist will fail/behave wierdly).
  (Copy of a change done by Kristian Nielsen, to test it.)
 2005-12-23 12:46:48 +01:00
unknown
2c88b6395b Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1


configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_archive.cc:
  Auto merged
storage/Makefile.am:
  Hand merge of the Makefile.am changes (I assume Antony pushed loadable).
 2005-12-22 20:06:05 -08:00
unknown
93b3d4efc6 Update to add in support for AZIO. 
AZIO differs in that it uses mysys methods and removes all of the malloc calls. 


configure.in:
  Update for new archive directory
libmysqld/Makefile.am:
  Adding archive storage directory.
sql/Makefile.am:
  Adding archive library.
sql/ha_archive.cc:
  Update for ha_archive to use azio.
sql/ha_archive.h:
  Updates to support azio.
storage/Makefile.am:
  Added archive directory.
storage/archive/Makefile.am:
  New BitKeeper file ``storage/archive/Makefile.am''
storage/archive/archive_test.c:
  New BitKeeper file ``storage/archive/archive_test.c''
storage/archive/azio.c:
  New BitKeeper file ``storage/archive/azio.c''
storage/archive/azlib.h:
  New BitKeeper file ``storage/archive/azlib.h''
 2005-12-22 19:50:10 -08:00
unknown
973949d0b3 Fix compile problem in ha_example.cc 2005-12-22 09:19:24 +01:00
unknown
09346e6e2d WL#1012: All changes as one single changeset. 
This includes both code and test cases.


BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Delete: mysql-test/r/ctype_ucs_binlog.result
BitKeeper/deleted/.del-rpl_delete_all.result~7c050d592614b3f:
  Delete: mysql-test/r/rpl_delete_all.result
BitKeeper/deleted/.del-rpl000013-slave.opt~18266ad8a2403e8d:
  Delete: mysql-test/t/rpl000013-slave.opt
BitKeeper/deleted/.del-rpl_delete_all.test~700a1490277780e0:
  Delete: mysql-test/t/rpl_delete_all.test
mysql-test/extra/binlog_tests/binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/blackhole.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_loaddata_m.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_log.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_reset_slave.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_stm_EE_err.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_user_variables.test:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_binlog.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_blackhole.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_ctype_cp932.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_ctype_ucs.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_drop_tmp_tbl.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_insert_select.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Import patch wl1012.patch
mysql-test/r/rpl_000012.result:
  Import patch wl1012.patch
mysql-test/r/rpl_000015.result:
  Import patch wl1012.patch
mysql-test/r/rpl_deadlock_innodb.result:
  Import patch wl1012.patch
mysql-test/r/rpl_flushlog_loop.result:
  Import patch wl1012.patch
mysql-test/r/rpl_loaddata_s.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_000001.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_EE_err.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_charset.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_ddl.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_err_ignoredtable.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_flsh_tbls.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_loaddata_m.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_log.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_max_relay_size.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_multi_query.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_mystery22.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_reset_slave.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_rewrt_db.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_sp.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_timezone.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_until.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_user_variables.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_view.result:
  Import patch wl1012.patch
mysql-test/t/binlog_row_binlog-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_000012.test:
  Import patch wl1012.patch
mysql-test/t/rpl_000015-slave.sh:
  Import patch wl1012.patch
mysql-test/t/rpl_000015.slave-mi:
  Import patch wl1012.patch
mysql-test/t/rpl_000015.test:
  Import patch wl1012.patch
mysql-test/t/rpl_deadlock_innodb-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-master.sh:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-slave.sh:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop.test:
  Import patch wl1012.patch
mysql-test/t/rpl_loaddata_s-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_loaddata_s.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_000001-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_err_ignoredtable-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_loaddata_m-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_log-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_log-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_mystery22.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_rewrt_db-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_rewrt_db.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_sp-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_sp-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_sp.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_timezone-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_timezone-slave.opt:
  Import patch wl1012.patch
BUILD/SETUP.sh:
  Import patch wl1012.patch
Makefile.am:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_timezone.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_until.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_view.test:
  Import patch wl1012.patch
client/Makefile.am:
  Import patch wl1012.patch
client/client_priv.h:
  Import patch wl1012.patch
client/mysqlbinlog.cc:
  Import patch wl1012.patch
configure.in:
  Import patch wl1012.patch
include/Makefile.am:
  Import patch wl1012.patch
include/base64.h:
  Import patch wl1012.patch
include/config-win.h:
  Import patch wl1012.patch
include/my_base.h:
  Import patch wl1012.patch
include/my_global.h:
  Import patch wl1012.patch
mysql-test/Makefile.am:
  Import patch wl1012.patch
mysql-test/mysql-test-run.pl:
  Import patch wl1012.patch
mysql-test/mysql-test-run.sh:
  Import patch wl1012.patch
mysql-test/r/date_formats.result:
  Import patch wl1012.patch
mysql-test/r/flush_block_commit.result:
  Import patch wl1012.patch
mysql-test/r/innodb.result:
  Import patch wl1012.patch
mysql-test/r/rpl000017.result:
  Import patch wl1012.patch
mysql-test/r/rpl_change_master.result:
  Import patch wl1012.patch
mysql-test/r/rpl_commit_after_flush.result:
  Import patch wl1012.patch
mysql-test/r/rpl_create_database.result:
  Import patch wl1012.patch
mysql-test/r/rpl_do_grant.result:
  Import patch wl1012.patch
mysql-test/r/rpl_loaddata.result:
  Import patch wl1012.patch
mysql-test/r/rpl_log_pos.result:
  Import patch wl1012.patch
mysql-test/r/rpl_multi_delete.result:
  Import patch wl1012.patch
mysql-test/r/rpl_multi_update.result:
  Import patch wl1012.patch
mysql-test/r/rpl_openssl.result:
  Import patch wl1012.patch
mysql-test/r/rpl_replicate_do.result:
  Import patch wl1012.patch
mysql-test/r/rpl_rotate_logs.result:
  Import patch wl1012.patch
mysql-test/r/rpl_server_id1.result:
  Import patch wl1012.patch
mysql-test/r/rpl_server_id2.result:
  Import patch wl1012.patch
mysql-test/r/rpl_temporary.result:
  Import patch wl1012.patch
mysql-test/r/user_var-binlog.result:
  Import patch wl1012.patch
mysql-test/t/create_select_tmp.test:
  Import patch wl1012.patch
mysql-test/t/date_formats.test:
  Import patch wl1012.patch
mysql-test/t/disabled.def:
  Import patch wl1012.patch
mysql-test/t/innodb.test:
  Import patch wl1012.patch
mysql-test/t/mysqlbinlog.test:
  Import patch wl1012.patch
mysql-test/t/mysqlbinlog2.test:
  Import patch wl1012.patch
mysql-test/t/rpl000002.test:
  Import patch wl1012.patch
mysql-test/t/rpl000006.test:
  Import patch wl1012.patch
mysql-test/t/rpl000013.test:
  Import patch wl1012.patch
mysql-test/t/rpl000017.test:
  Import patch wl1012.patch
mysql-test/t/rpl_auto_increment.test:
  Import patch wl1012.patch
mysql-test/t/rpl_change_master.test:
  Import patch wl1012.patch
mysql-test/t/rpl_commit_after_flush.test:
  Import patch wl1012.patch
mysql-test/t/rpl_create_database.test:
  Import patch wl1012.patch
mysql-test/t/rpl_do_grant.test:
  Import patch wl1012.patch
mysql-test/t/rpl_drop.test:
  Import patch wl1012.patch
mysql-test/t/rpl_empty_master_crash.test:
  Import patch wl1012.patch
mysql-test/t/rpl_failed_optimize.test:
  Import patch wl1012.patch
mysql-test/t/rpl_heap.test:
  Import patch wl1012.patch
mysql-test/t/rpl_insert_id.test:
  Import patch wl1012.patch
mysql-test/t/rpl_insert_ignore.test:
  Import patch wl1012.patch
mysql-test/t/rpl_loaddata.test:
  Import patch wl1012.patch
mysql-test/t/rpl_log_pos.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_delete.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_update.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_update2.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_update3.test:
  Import patch wl1012.patch
mysql-test/t/rpl_openssl.test:
  Import patch wl1012.patch
mysql-test/t/rpl_redirect.test:
  Import patch wl1012.patch
mysql-test/t/rpl_relayrotate.test:
  Import patch wl1012.patch
mysql-test/t/rpl_replicate_do.test:
  Import patch wl1012.patch
mysql-test/t/rpl_rotate_logs.test:
  Import patch wl1012.patch
mysql-test/t/rpl_server_id1.test:
  Import patch wl1012.patch
mysql-test/t/rpl_sp_effects.test:
  Import patch wl1012.patch
mysql-test/t/rpl_temporary.test:
  Import patch wl1012.patch
mysql-test/t/rpl_trigger.test:
  Import patch wl1012.patch
mysql-test/t/sp.test:
  Import patch wl1012.patch
mysql-test/t/user_var-binlog.test:
  Import patch wl1012.patch
mysys/Makefile.am:
  Import patch wl1012.patch
mysys/base64.c:
  Import patch wl1012.patch
sql/Makefile.am:
  Import patch wl1012.patch
sql/ha_innodb.cc:
  Import patch wl1012.patch
sql/ha_innodb.h:
  Import patch wl1012.patch
sql/ha_partition.cc:
  Import patch wl1012.patch
sql/handler.cc:
  Import patch wl1012.patch
sql/handler.h:
  Import patch wl1012.patch
sql/item_sum.cc:
  Import patch wl1012.patch
sql/log.cc:
  Import patch wl1012.patch
sql/log_event.cc:
  Import patch wl1012.patch
sql/log_event.h:
  Import patch wl1012.patch
sql/mysql_priv.h:
  Import patch wl1012.patch
sql/mysqld.cc:
  Import patch wl1012.patch
sql/rpl_filter.h:
  Import patch wl1012.patch
sql/set_var.cc:
  Import patch wl1012.patch
sql/share/errmsg.txt:
  Import patch wl1012.patch
sql/slave.cc:
  Import patch wl1012.patch
sql/slave.h:
  Import patch wl1012.patch
sql/sp.cc:
  Import patch wl1012.patch
sql/sp_head.cc:
  Import patch wl1012.patch
sql/sql_acl.cc:
  Import patch wl1012.patch
sql/sql_base.cc:
  Import patch wl1012.patch
sql/sql_class.cc:
  Import patch wl1012.patch
sql/sql_class.h:
  Import patch wl1012.patch
sql/sql_delete.cc:
  Import patch wl1012.patch
sql/sql_insert.cc:
  Import patch wl1012.patch
sql/sql_lex.h:
  Import patch wl1012.patch
sql/sql_list.h:
  Import patch wl1012.patch
sql/sql_load.cc:
  Import patch wl1012.patch
sql/sql_parse.cc:
  Import patch wl1012.patch
sql/sql_plugin.cc:
  Import patch wl1012.patch
sql/sql_rename.cc:
  Import patch wl1012.patch
sql/sql_repl.h:
  Import patch wl1012.patch
sql/sql_select.cc:
  Import patch wl1012.patch
sql/sql_show.cc:
  Import patch wl1012.patch
sql/sql_table.cc:
  Import patch wl1012.patch
sql/sql_udf.cc:
  Import patch wl1012.patch
sql/sql_union.cc:
  Import patch wl1012.patch
sql/sql_update.cc:
  Import patch wl1012.patch
sql/sql_yacc.yy:
  Import patch wl1012.patch
sql/table.cc:
  Import patch wl1012.patch
sql/table.h:
  Import patch wl1012.patch
storage/innobase/include/lock0lock.h:
  Import patch wl1012.patch
storage/innobase/include/row0mysql.h:
  Import patch wl1012.patch
storage/innobase/include/row0vers.h:
  Import patch wl1012.patch
storage/innobase/lock/lock0lock.c:
  Import patch wl1012.patch
storage/innobase/row/row0mysql.c:
  Import patch wl1012.patch
storage/innobase/row/row0sel.c:
  Import patch wl1012.patch
storage/innobase/row/row0vers.c:
  Import patch wl1012.patch
 2005-12-22 06:39:02 +01:00
unknown
65c560e9b8 Change for plugin storage engine to be built after mysqld 
Makefile.am:
  Change build order for plugins
config/ac-macros/storage.m4:
  Change build order for plugins
configure.in:
  Change build order for plugins
storage/Makefile.am:
  add csv and example to dist
storage/csv/Makefile.am:
  remove unneeded dep
storage/example/Makefile.am:
  remove unneeded dep
 2005-12-21 14:58:03 -08:00
unknown
597dc9a8e1 Fix for plugins work 
storage/csv/Makefile.am:
  Build currently depends on sql/sql_yacc.h
storage/example/Makefile.am:
  Build currently depends on sql/sql_yacc.h
storage/example/ha_example.cc:
  remove old handlerton entries
 2005-12-21 14:03:57 -08:00
unknown
c3c43e129b plugin version changes 
include/plugin.h:
  relocate version
sql/handler.cc:
  no version checks here
sql/handler.h:
  version is kinda short
sql/sql_show.cc:
  version is a short, rearrange and show all
storage/csv/ha_tina.cc:
  rearrange version
storage/example/ha_example.cc:
  rearrange version
 2005-12-21 12:50:50 -08:00
unknown
5459c9709e Merge xiphis.org:/home/antony/work2/mysql-5.1 
into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2


configure.in:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  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.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_table.cc:
  SCCS merged
 2005-12-21 10:26:39 -08:00
unknown
613dd50a33 Finalize storage engine plugins 
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code


storage/example/ha_example.h:
  Rename: sql/examples/ha_example.h -> storage/example/ha_example.h
storage/csv/ha_tina.h:
  Rename: sql/examples/ha_tina.h -> storage/csv/ha_tina.h
config/ac-macros/storage.m4:
  if hton name is "no", then we don't install it as a builtin
configure.in:
  pluggable changes
include/plugin.h:
  version field
mysql-test/r/bdb.result:
  savepoint results copied from innodb test
mysql-test/r/information_schema.result:
  PLUGINS information schema
mysql-test/r/information_schema_db.result:
  PLUGINS information schema
mysql-test/t/bdb.test:
  savepoint test copied from innodb test
sql/Makefile.am:
  tina and example are not here anymore
sql/authors.h:
  minor tweek
sql/ha_archive.cc:
  remove unwanted handlerton entries
sql/ha_berkeley.cc:
  remove unwanted handlerton entries
  support for savepoints
  changes to show logs
sql/ha_blackhole.cc:
  remove unwanted handlerton entries
sql/ha_federated.cc:
  remove unwanted handlerton entries
sql/ha_heap.cc:
  remove unwanted handlerton entries
sql/ha_innodb.cc:
  remove unwanted handlerton entries
  changes for show status
sql/ha_myisam.cc:
  remove unwanted handlerton entries
sql/ha_myisammrg.cc:
  remove unwanted handlerton entries
sql/ha_ndbcluster.cc:
  remove unwanted handlerton entries
  changes to stat_print
sql/ha_partition.cc:
  remove unwanted handlerton entries
  bye bye enum db_type
sql/ha_partition.h:
  bye bye enum db_type
sql/handler.cc:
  remove unwanted handlerton entries
  bye bye enum db_type
sql/handler.h:
  remove unwanted handlerton entries
  bye bye enum db_type
  changes to stat_print_fn
sql/item_sum.cc:
  bye bye enum db_type
sql/log.cc:
  remove unwanted handlerton entries
sql/mysql_priv.h:
  bye bye enum db_type
sql/mysqld.cc:
  bye bye enum db_type
  reorder plugin initialization
sql/set_var.cc:
  bye bye enum db_type
sql/set_var.h:
  bye bye enum db_type
sql/sql_base.cc:
  bye bye enum db_type
sql/sql_cache.cc:
  bye bye enum db_type
sql/sql_class.h:
  bye bye enum db_type
sql/sql_delete.cc:
  bye bye enum db_type
sql/sql_insert.cc:
  bye bye enum db_type
sql/sql_lex.h:
  show plugin
sql/sql_parse.cc:
  bye bye enum db_type
sql/sql_partition.cc:
  bye bye enum db_type
sql/sql_plugin.cc:
  loadable storage engines
sql/sql_plugin.h:
  loadable storage engines
sql/sql_rename.cc:
  bye bye enum db_type
sql/sql_select.cc:
  bye bye enum db_type
sql/sql_show.cc:
  SHOW PLUGIN
  PLUGINS information schema
  changes to show engines
sql/sql_table.cc:
  bye bye enum db_type
sql/sql_view.cc:
  bye bye enum db_type
sql/sql_view.h:
  bye bye enum db_type
sql/sql_yacc.yy:
  bye bye enum db_type
sql/table.cc:
  bye bye enum db_type
sql/table.h:
  bye bye enum db_type
sql/unireg.cc:
  bye bye enum db_type
storage/csv/ha_tina.cc:
  make tina into a loadable plugin
storage/example/ha_example.cc:
  make into a plugin
storage/csv/Makefile.am:
  New BitKeeper file ``storage/csv/Makefile.am''
storage/example/Makefile.am:
  New BitKeeper file ``storage/example/Makefile.am''
 2005-12-21 10:18:40 -08:00
unknown
ec7a7ac278 Bug fix for bug #15843 "Added mmap support in myisam creates compile problem 
on AIX 5.2"

Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
removed duplicates

my_sys.h:
  added definition for MAP_NORESERVE
  (for Irix and AIX systems)
sql_map.cc:
  removed definition of MAP_NORESERVE
mi_packrec.c:
  removed definition of MAP_NORESERVE and MMAP_PRIVATE


storage/myisam/mi_packrec.c:
  removed definition of MAP_NORESERVE and MMAP_PRIVATE
sql/sql_map.cc:
  removed definition of MAP_NORESERVE
include/my_sys.h:
  added definition for MAP_NORESERVE
  (for Irix and AIX systems)
 2005-12-19 14:16:21 +01:00
unknown
c181806154 Merge mysql.com:/M51/try-5.1-extra into mysql.com:/M51/mysql-5.1 2005-12-16 12:47:14 +01:00
unknown
1aba662c7d storage/innobase/Makefile.am : 
Restore "make dist" for the header files in "storage/innobase/include".


storage/innobase/Makefile.am:
  A recent change (coming from the "innobase" team, pushed by alexi) broke "make dist"
  which is needed for release builds (deletion of "storage/innobase/include/Makefile.am").
  The effect was that files "storage/innobase/include/*.h" were missing in the source.tgz
  
  Restore "make dist" without fully reverting the change by listing the files in a (new)
  "EXTRA_DIST" target in the parent level directory.
 2005-12-16 12:45:43 +01:00
unknown
4ede1ed354 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 15:07:20 +01:00
unknown
6901d789d6 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-12-15 09:34:07 +01:00
unknown
409fbaa6bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 08:58:39 +01:00
unknown
c99f3d41d9 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
 2005-12-14 18:08:56 +03:00
unknown
ed7eaa4cca Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
 2005-12-14 14:03:50 +01:00
unknown
952af0ac9b Merge mysql.com:/usr/local/mysql/mysql-mawk 
into  mysql.com:/usr/local/mysql/mysql-5.1-new


storage/bdb/dist/gen_rec.awk:
  Auto merged
 2005-12-14 13:24:26 +01:00
unknown
4e98c2e886 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge
 2005-12-14 11:06:40 +01:00
unknown
4e4e347b78 ndb - merge fix 
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge fix
 2005-12-13 19:21:02 +01:00
unknown
ad4d877350 Changes from the innodb-5.1-ss28 snapshot. 
Removed include/Makefile.am and the reference to it.
 Deleted db/db0err.h and db directory.
 Check index column sizes in a better way (bug 13315).
 Fixed comments for memory allocation functions and added
 some extra checks. Adapted callers.


BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e:
  Delete: storage/innobase/include/Makefile.am
BitKeeper/deleted/.del-db0err.h~bfeec2efe86ac48b:
  Delete: storage/innobase/db/db0err.h
mysql-test/r/innodb.result:
  Changes from the innodb-5.1-ss28 snapshot.
mysql-test/t/innodb.test:
  Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.cc:
  Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.h:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/Makefile.am:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/configure.in:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/ha/ha0ha.c:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.h:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.ic:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.h:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.ic:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/lock/lock0lock.c:
  Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/mem/mem0mem.c:
  Changes from the innodb-5.1-ss28 snapshot.
 2005-12-13 16:49:24 +03:00
unknown
ad01aed827 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
 2005-12-13 12:07:36 +01:00
unknown
f8d6d13781 The innodb-5.0-ss52 snapshot changes were erroneously auto-merged 
to 5.1. Undoing the merge.


mysql-test/r/innodb.result:
  Undoing erroneous auto-merge 5.0 -> 5.1
mysql-test/t/innodb.test:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.cc:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/btr/btr0sea.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0dict.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0load.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/buf0buf.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0dict.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0load.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/rem0cmp.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/rem/rem0cmp.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/row/row0mysql.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
 2005-12-08 15:00:18 +03:00
unknown
1365856e8d Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0load.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0load.h:
  Auto merged
storage/innobase/include/rem0cmp.h:
  Auto merged
storage/innobase/rem/rem0cmp.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
mysql-test/r/innodb.result:
  Resolve conflicts
sql/share/errmsg.txt:
  Resolve conflict
 2005-12-06 18:27:39 -08:00
unknown
2c6d750084 Fix 'make dist' with new bundled BDB 
storage/bdb/Makefile.in:
  Trim list of BDB directories
 2005-12-06 08:21:15 -08:00
unknown
b1f3873093 Add missing BDB include file 2005-12-05 16:48:09 -08:00
unknown
bd26f9a200 Remove generated BDB README file 
BitKeeper/deleted/.del-README~9359d4cae57d3e9:
  Remove generated file
 2005-12-05 16:19:16 -08:00
unknown
4b77a07cb4 Cleanup after import of BDB 
BitKeeper/deleted/.del-mutex.c~f6a0db232d63dba7:
  Delete: storage/bdb/mutex/mutex.c
storage/bdb/dbinc/db.in:
  Add DBT->app_private
storage/bdb/dist/configure.ac:
  Skip tcl stuff
storage/bdb/dist/s_all:
  Skip setup we don't need to do
storage/bdb/dist/s_include:
  Skip excluded directories
storage/bdb/dist/s_perm:
  Skip excluded directories
storage/bdb/dist/s_recover:
  Skip excluded directories
storage/bdb/dist/s_symlink:
  Skip excluded directories
 2005-12-05 16:03:52 -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
08ea984e27 ndb - wl#2972 part 1: merge events per event op, gci 
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  wl#2972 part 1: merge events per event op, gci
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  wl#2972 part 1: merge events per event op, gci
storage/ndb/ndbapi-examples/ndbapi_event/Makefile:
  wl#2972 part 1: merge events per event op, gci
storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp:
  wl#2972 part 1: merge events per event op, gci
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  wl#2972 part 1: merge events per event op, gci
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  wl#2972 part 1: merge events per event op, gci
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  wl#2972 part 1: merge events per event op, gci
storage/ndb/test/ndbapi/test_event.cpp:
  wl#2972 part 1: merge events per event op, gci
 2005-12-05 15:20:15 +01:00
unknown
90ab6eedb8 Merge mysql.com:/home/jimw/my/mysql-5.1-14655 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/ha_berkeley.cc:
  Auto merged
 2005-12-02 16:11:04 -08:00
unknown
93e597c12c Merge moonbone.local:/work/15028-bug-5.0-mysql 
into moonbone.local:/work/15028-bug-5.1-new-mysql


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
 2005-12-02 22:07:10 +03:00
unknown
5c025e3f8b Merge bk-internal:/home/bk/mysql-5.1-new 
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
 2005-12-02 12:02:38 +01:00
unknown
8705383af3 Merge selena.:H:/MYSQL/bkt/mysql-5.0 
into  selena.:H:/MYSQL/bkt/mysql-5.1


sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
 2005-12-01 23:47:44 +03:00
unknown
4a115d65b0 Many files: 
Added mmap support for MyISAM engine


configure.in:
  Added mmap support for MyISAM engine
include/my_base.h:
  Added mmap support for MyISAM engine
include/my_sys.h:
  Added mmap support for MyISAM engine
sql/ha_myisam.cc:
  Added mmap support for MyISAM engine
sql/mysql_priv.h:
  Added mmap support for MyISAM engine
sql/mysqld.cc:
  Added mmap support for MyISAM engine
sql/records.cc:
  Added mmap support for MyISAM engine
sql/set_var.cc:
  Added mmap support for MyISAM engine
storage/myisam/mi_close.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_delete_all.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_dynrec.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_extra.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_locking.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_open.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_packrec.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_statrec.c:
  Added mmap support for MyISAM engine
storage/myisam/myisamdef.h:
  Added mmap support for MyISAM engine
 2005-12-01 13:34:48 +01:00
unknown
8c7852ba3c Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new


include/my_base.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
libmysqld/Makefile.am:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
 2005-11-28 20:14:12 +01:00
unknown
705965362d added missing errorcode handling in NdbIndexStat causing test failure 2005-11-24 14:57:14 +01:00
unknown
33a2716a85 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/Makefile.am:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  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_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/docs/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
libmysqld/Makefile.am:
  Merged from 5.0 to 5.1.
sql/ha_berkeley.cc:
  Merged from 5.0 to 5.1.
sql/lex.h:
  Merged from 5.0 to 5.1.
sql/set_var.cc:
  Merged from 5.0 to 5.1.
sql/share/errmsg.txt:
  Merged from 5.0 to 5.1.
sql/sql_lex.h:
  Merged from 5.0 to 5.1.
sql/sql_show.cc:
  Merged from 5.0 to 5.1.
sql/sql_yacc.yy:
  Merged from 5.0 to 5.1.
 2005-11-23 14:57:00 +02:00
unknown
817ee181c3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-23 12:34:29 +01:00
unknown
bd0584df26 corrected compile error 
updated listen_event to handle _all_ events


storage/ndb/src/common/portlib/NdbThread.c:
  corrected compile error
storage/ndb/test/tools/listen.cpp:
  updated listen_event to handle _all_ events
 2005-11-23 12:32:38 +01:00
unknown
f85a819256 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-23 11:53:21 +01:00
unknown
da82e8ff19 updated ndb listen_event to print more info, and to give immediate respose 2005-11-23 11:53:19 +01:00
unknown
494daf7981 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 
sql/mysqld.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
 2005-11-23 11:24:52 +01:00
unknown
38961d022f added ndb testcase WritePartialIgnoreError 
(currently causes nodefailure)


storage/ndb/test/ndbapi/testNdbApi.cpp:
  added ndb testcase WritePartialIgnoreError
storage/ndb/test/run-test/daily-basic-tests.txt:
  added ndb testcase WritePartialIgnoreError
 2005-11-23 10:45:15 +01:00
unknown
c9f8b7b41f fix error handling if thread creation fails in ndbd 
make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
  changed event buffer reporting in ndb to occur not as often
  corrected the bank application
  corrected output from run-test make-config.sh


storage/ndb/src/common/portlib/NdbThread.c:
    fix error handling if thread creation fails in ndbd
    make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
    fix error handling if thread creation fails in ndbd
storage/ndb/src/ndbapi/Ndb.cpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  corrected the bank application
storage/ndb/test/run-test/make-config.sh:
  corrected output from run-test make-config.sh
 2005-11-22 18:05:10 +01:00
unknown
defa8e8402 ndb - bug#14007 5.1 (merge 5.0->5.1) 
mysql-test/r/ndb_charset.result:
  bug#14007 5.1 (merge 5.0->5.1)
mysql-test/t/ndb_charset.test:
  bug#14007 5.1 (merge 5.0->5.1)
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 5.1 (merge 5.0->5.1)
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  bug#14007 5.1 (merge 5.0->5.1)
 2005-11-20 11:15:13 +01:00
unknown
51972f1aea Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
 2005-11-19 13:06:16 +01:00
unknown
380690316f Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).


configure.in:
  Auto merged
mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/base64.c:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
mysql-test/t/disabled.def:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  used "ul", Pekka said he'll fix
 2005-11-19 10:43:28 +01: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
5db598890e ndb - wl#1497 LinearPool seize_index 
storage/ndb/src/kernel/vm/LinearPool.hpp:
  wl#1497 LinearPool seize_index
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  wl#1497 LinearPool seize_index
 2005-11-18 00:09:24 +01:00
unknown
fef0912115 ndb - wl#1497 add LinearPool 
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  test LinearPool
 2005-11-14 12:03:23 +01:00
unknown
daa84c7fa5 ndb - 5.1.2 build fix: Signal syms in test pgms on hp3750 
storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
  add some Signal syms to test programs for hp3750, hope it dont break other platforms..
storage/ndb/src/kernel/blocks/print_file.cpp:
  add some Signal syms to test programs for hp3750, hope it dont break other platforms..
 2005-11-11 12:47:10 +01:00
unknown
f24078f7bb ndb - 5.1.2 build fix: array initializer crashes gcc-2.95.3 
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  array initializer crashes gcc-2.95.3
 2005-11-11 11:36:00 +01:00
unknown
3709b2b391 Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/clone-5.1 2005-11-10 10:05:59 +01:00
unknown
6a8eb801ce corrected compile error 2005-11-10 09:24:27 +01:00
unknown
d7f076de17 stilled memleak in ndb Gci_container 2005-11-09 23:08:53 +01:00
unknown
f91475a7aa Compile fix for NDB 5.1.2 on Solaris, provided by Pekka. 2005-11-09 18:36:10 +01:00
unknown
c4239fee21 Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-11-09 09:24:16 +01:00
unknown
99b3bc7ae0 ndb - super pool update (future use) 
storage/ndb/src/kernel/vm/SuperPool.cpp:
  super pool update
storage/ndb/src/kernel/vm/SuperPool.hpp:
  super pool update
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  super pool update
 2005-11-08 23:48:26 +01:00
unknown
c51e75e67f Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
unknown
867a5b545e configure.in: 
Temporary work around to pass --build=... to configure
  in storage engine sub directory
print_file.cpp:
  HP-UX compiler don't like variable shadowing
AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES


sql/Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES
storage/ndb/include/ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
storage/ndb/include/kernel/trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
storage/ndb/src/kernel/blocks/print_file.cpp:
  HP-UX compiler don't like variable shadowing
configure.in:
  Temporary work around to pass --build=... to configure
  in storage engine sub directory
 2005-11-08 07:41:46 +01:00
unknown
911e52dbf1 Use DB_LOG_AUTOREMOVE flag instead of noticecall customization to BDB 
so log files are deleted once they are no longer in use. (Bug #14655)


sql/ha_berkeley.cc:
  Remove usage of non-standard noticecall interface, and just use
  DB_LOG_AUTOREMOVE environment flag so that log files are deleted
  once no longer in use.
storage/bdb/dbinc/db.in:
  Remove noticecall interface
storage/bdb/env/env_method.c:
  Remove noticecall interface
storage/bdb/log/log_put.c:
  Remove noticecall interface
 2005-11-07 16:33:53 -08:00
unknown
bc0292087f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-07 20:29:58 +01:00
unknown
9ea37cf25a corrected compile error in ndb 2005-11-07 16:48:05 +01:00
unknown
6eb7f72be9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/m51new


configure.in:
  Auto merged
storage/ndb/include/kernel/kernel_types.h:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
 2005-11-07 16:30:03 +01:00
unknown
6b3a9caef9 Make storage engines "pluggable", handlerton work 
Makefile.am:
  Changes to autoconf subst
config/ac-macros/ha_berkeley.m4:
  simplify
config/ac-macros/ha_ndbcluster.m4:
  simplify
config/ac-macros/ha_partition.m4:
  simplify
configure.in:
  strip configure of storage engine specific cruft and simplify
extra/Makefile.am:
  changes to autoconf/automake subst
libmysqld/Makefile.am:
  only compile storage engines if required.
  make find object file a little smarter
libmysqld/examples/Makefile.am:
  changes to autoconf subst
mysql-test/Makefile.am:
  remove storage engine specific cruft
mysql-test/r/ps_1general.result:
  cannot gaurantee order of results from 'show storage engines'
mysql-test/r/show_check.result:
  fix test - frm file fails to be deleted if it is invalid
mysql-test/r/sql_mode.result:
  isam does not exist, test may need to be redone/fixed in 5.0
mysql-test/r/warnings.result:
  isam no longer exists
mysql-test/t/ps_1general.test:
  cannot gaurantee order of results from 'show storage engines'
mysql-test/t/show_check.test:
  fix test - frm file fails to be deleted if it is invalid
mysql-test/t/sql_mode.test:
  isam does not exist, test may need to be redone/fixed in 5.0
mysql-test/t/system_mysql_db_fix.test:
  change isam to myisam
mysql-test/t/view.test:
  change isam to myisam
mysql-test/t/warnings.test:
  isam no longer exists
sql/Makefile.am:
  Make storage engines "pluggable" stage 1
  only compile storage engines if included
sql/examples/ha_example.cc:
  handlerton work
sql/examples/ha_example.h:
  handlerton work
sql/examples/ha_tina.cc:
  handlerton work
sql/examples/ha_tina.h:
  handlerton work
sql/ha_archive.cc:
  handlerton work
sql/ha_archive.h:
  handlerton work
sql/ha_berkeley.cc:
  handlerton work
sql/ha_berkeley.h:
  handlerton work
sql/ha_blackhole.cc:
  handlerton work
sql/ha_federated.cc:
  handlerton work
sql/ha_federated.h:
  handlerton work
sql/ha_heap.cc:
  handlerton work
sql/ha_innodb.cc:
  handlerton work
sql/ha_innodb.h:
  handlerton work
sql/ha_myisam.cc:
  handlerton work
sql/ha_myisammrg.cc:
  handlerton work
sql/ha_ndbcluster.cc:
  handlerton work
sql/ha_ndbcluster.h:
  handlerton work
sql/ha_partition.cc:
  handlerton work
sql/handler.cc:
  start removing storage engine specific cruft
sql/handler.h:
  start removing storage engine specific cruft
  db_type for binlog handlerton
  handlerton flag for not-user-selectable storage engines
sql/lex.h:
  start removing storage engine specific cruft
sql/log.cc:
  handlerton work
  give binlog handlerton a 'real' db_type
sql/mysql_priv.h:
  start removing storage engine specific cruft
sql/mysqld.cc:
  start removing storage engine specific cruft
sql/set_var.cc:
  start removing storage engine specific cruft
sql/sp_head.cc:
  start removing storage engine specific cruft
sql/sql_class.cc:
  start removing storage engine specific cruft
sql/sql_class.h:
  start removing storage engine specific cruft
sql/sql_lex.h:
  start removing storage engine specific cruft
sql/sql_manager.cc:
  start removing storage engine specific cruft
sql/sql_manager.h:
  start removing storage engine specific cruft
sql/sql_parse.cc:
  start removing storage engine specific cruft
sql/sql_partition.cc:
  start removing storage engine specific cruft
sql/sql_prepare.cc:
  start removing storage engine specific cruft
sql/sql_show.cc:
  start removing storage engine specific cruft
sql/sql_table.cc:
  changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE
  start removing storage engine specific cruft
sql/sql_update.cc:
  changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE
sql/sql_yacc.yy:
  start removing storage engine specific cruft
  test if we should throw error
sql/table.cc:
  changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE
sql/table.h:
  changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE
sql/unireg.cc:
  changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE
storage/ndb/include/kernel/kernel_types.h:
  added my_config.h
storage/ndb/include/ndb_global.h.in:
  added my_config.h
storage/ndb/include/ndb_types.h.in:
  added my_config.h
config/ac-macros/storage.m4:
  New BitKeeper file ``config/ac-macros/storage.m4''
sql/handlerton.cc.in:
  New BitKeeper file ``sql/handlerton.cc.in''
 2005-11-07 16:25:06 +01:00
unknown
6be5f8a340 ndb - Fix problematic handling of TUP_ALLOC/DEALLOC REQ wrt varsize 
same row -
      prepare delete, prepare insert (with different size), commit delete, commit insert would lead to assertion
        as prepare insert didnt call handle_size_change_after_update
 2005-11-07 13:28:19 +01:00
unknown
ee740746af Import ndb varsize 
BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829:
  Delete: storage/ndb/src/kernel/vm/MetaData.cpp
BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c:
  Delete: storage/ndb/src/kernel/vm/MetaData.hpp
BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42:
  Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp
BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d:
  Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp
BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9:
  Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp''
storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp''
storage/ndb/include/kernel/signaldata/CreateObj.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateObj.hpp''
storage/ndb/include/kernel/signaldata/DictObjOp.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DictObjOp.hpp''
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropFilegroup.hpp''
storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp''
storage/ndb/include/kernel/signaldata/DropObj.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropObj.hpp''
storage/ndb/include/kernel/signaldata/Extent.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/Extent.hpp''
storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp''
storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp''
storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp''
storage/ndb/include/kernel/signaldata/RestoreImpl.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/RestoreImpl.hpp''
storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp''
storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp''
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp''
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp''
storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp''
storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp''
storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp''
storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp''
storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp''
storage/ndb/src/kernel/blocks/diskpage.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/diskpage.cpp''
storage/ndb/src/kernel/blocks/diskpage.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/diskpage.hpp''
storage/ndb/src/kernel/blocks/lgman.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/lgman.cpp''
storage/ndb/src/kernel/blocks/lgman.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/lgman.hpp''
storage/ndb/src/kernel/blocks/pgman.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/pgman.cpp''
storage/ndb/src/kernel/blocks/pgman.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/pgman.hpp''
storage/ndb/src/kernel/blocks/print_file.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/print_file.cpp''
storage/ndb/src/kernel/blocks/restore.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/restore.cpp''
storage/ndb/src/kernel/blocks/restore.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/restore.hpp''
storage/ndb/src/kernel/blocks/tsman.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/tsman.cpp''
storage/ndb/src/kernel/blocks/tsman.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/tsman.hpp''
storage/ndb/src/kernel/vm/DLCFifoList.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/DLCFifoList.hpp''
storage/ndb/src/kernel/vm/DLCHashTable.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/DLCHashTable.hpp''
storage/ndb/src/kernel/vm/KeyTable2Ref.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/KeyTable2Ref.hpp''
storage/ndb/src/kernel/vm/Rope.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/Rope.cpp''
storage/ndb/src/kernel/vm/Rope.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/Rope.hpp''
 2005-11-07 12:19:28 +01:00
unknown
696d7fe444 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-11-06 18:42:27 +01:00
unknown
df33aacd87 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-06 16:16:18 +01:00
unknown
9979b03745 NdbIndexStat.cpp, NdbIndexStat.hpp, Suma.hpp portability changes from pekka 
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Added a friend declaration to solve a HP-UX C++ scoping issue
storage/ndb/include/ndbapi/NdbIndexStat.hpp:
  Pekka added forward declarations needed by several C++ compilers
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
  Get rid of an uninitialized
 2005-11-06 14:12:14 +01:00
unknown
66002e452d WL#2575 - Fulltext: Parser plugin for FTS 
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.


include/ft_global.h:
  Default parser added.
include/my_global.h:
  dlopen related code moved from sql_udf.cc into my_global.h
include/myisam.h:
  Added fulltext parser to MI_KEYDEF
libmysqld/Makefile.am:
  Added LIBDIR macro.
mysql-test/r/connect.result:
  Test result fixed: added plugin table
mysql-test/r/information_schema.result:
  Test result fixed: added plugin table.
mysql-test/r/mysqlcheck.result:
  Test result fixed: added plugin table.
mysql-test/r/system_mysql_db.result:
   Test fixed: added plugin table
mysql-test/t/system_mysql_db_fix.test:
   Test fixed: added plugin table
scripts/mysql_create_system_tables.sh:
  Added mysql.plugin table.
scripts/mysql_fix_privilege_tables.sql:
  Added mysql.plugin table.
sql/Makefile.am:
  Added LIBDIR macro.
sql/ha_myisam.cc:
  Pass fulltext parser from sql to myisam layer.
sql/lex.h:
  Plugin related symbols.
sql/mysqld.cc:
  Initialize/deinitialize plugins, pass opt_plugin_dir.
  plugin-dir renamed to plugin_dir.
  plugin_dir is relative to mysql_home now.
sql/set_var.cc:
  plugin_dir added to SHOW VARIABLES.
sql/share/errmsg.txt:
  Plugin related error messages.
sql/sql_class.h:
  Added parser to Key class.
  Hold parser_name instead of plugin in Key class.
sql/sql_lex.h:
  INSTALL/UNINSTALL PLUGIN commands.
sql/sql_parse.cc:
  INSTALL/UNINSTALL PLUGIN commands.
sql/sql_show.cc:
  SHOW CREATE TABLE: output parser name if index was created WITH PARSER.
sql/sql_table.cc:
  Pass fulltext parser from yacc to sql layer.
sql/sql_udf.cc:
  dlopen related code moved into my_global.h.
  Implemented better check for UDF path.
  UDF loads libraries that are under plugin_dir now.
sql/sql_yacc.yy:
  INSTALL/UNINSTALL PLUGIN syntax.
  Added WITH PARSER syntax to CREATE/ALTER TABLE/INDEX.
  opt_fulltext_parser must allocate memory, since it will be used afterwards.
sql/table.cc:
  Save/restore fulltext parser in extra data segment.
  Added DBUG_PRINTs.
storage/myisam/ft_boolean_search.c:
  Split functions so they can be used by fulltext parser.
  Use fulltext parser if specified.
storage/myisam/ft_nlq_search.c:
  Use fulltext parser.
storage/myisam/ft_parser.c:
  Split functions so they can be used by fulltext parser.
  Use fulltext parser if specified.
storage/myisam/ft_static.c:
  Default fulltext parser added.
storage/myisam/ft_update.c:
  Use fulltext parser.
storage/myisam/ftdefs.h:
  FTB_PARAM moved into plugin.h and renamed to MYSQL_FTPARSER_BOOLEAN_INFO.
storage/myisam/mi_open.c:
  Set default parser.
 2005-11-06 13:13:06 +01:00
unknown
2bddb07664 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new


sql/handler.h:
  Auto merged
 2005-11-06 08:30:26 +01:00
unknown
89288fac18 WL #528: Faster free_tmp_table 2005-11-06 08:29:03 +01:00
unknown
dbfe5a961f Reapplied portability changes, from changesets by kent, joerg and msvensson 
mysys/base64.c:
  Portability change for SCO/HP, compiler don't like
  doing pointer arithmetic on void* variable
include/my_bitmap.h:
  "inline" functions (especially in header files) should be declared "static",
  or else we may get "multiply defined" when they are used in several modules.
  (Solaris compiler problem)
sql/handler.h:
  Compatibility change for AIX compiler
storage/bdb/Makefile.in:
  Added bdb "sequence" directory to "make dist"
cmd-line-utils/readline/complete.c:
  Avoid FreeBSD 5.3 problems including <sys/file.h>
mysql-test/t/disabled.def:
  Disable compress.test for now
storage/bdb/build_unix/.IGNORE_ME:
  File that is copied to prevent empty directories in source TAR
 2005-11-06 02:19:51 +01:00
unknown
cca0ce5b3e ndb - fix conflicting error codes 2005-11-05 22:55:51 +01:00
unknown
e610dc133f ndb - test_event 
Fix problem when creating shadow table
 2005-11-05 22:54:25 +01:00
unknown
854ff21d4d ndb - bug with index build of unique index with 32 attributes 
since NDB$FRAGMENT is automatically added, there was a over run in the struct


storage/ndb/include/kernel/AttributeList.hpp:
  Fix unique index with 32 attributes
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix unique index with 32 attributes
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix unique index with 32 attributes
 2005-11-05 22:50:15 +01:00
unknown
2361720c98 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1


BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
  Auto merged
BitKeeper/deleted/.del-makefilewin~13888739357b3025:
  Auto merged
BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
  Auto merged
BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
  Auto merged
BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
  Auto merged
BitKeeper/deleted/.del-makefilewin~5104767c73775697:
  Auto merged
BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
  Auto merged
BitKeeper/deleted/.del-makefilewin~63acd666293282a:
  Auto merged
BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
  Auto merged
BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
  Auto merged
Makefile.am:
  Auto merged
BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
  Auto merged
BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
  Auto merged
BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
  Auto merged
BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
  Auto merged
BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
  Auto merged
BitKeeper/etc/config:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/base64.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/base64.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/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  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_help.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_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_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/_check.c:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/innobase/include/Makefile.am:
  Auto merged
storage/innobase/include/rem0rec.h:
  Auto merged
storage/innobase/include/rem0rec.ic:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
storage/ndb/config/type_util.mk.am:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/include/transporter/TransporterCallback.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/Makefile.am:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.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/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/kernel/vm/VMSignal.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.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/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BUILD/SETUP.sh:
  manual merge
configure.in:
  manual merge
mysql-test/r/alter_table.result:
  manual merge
sql/handler.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/records.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
  Fix labels
sql/sql_update.cc:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
storage/ndb/config/type_ndbapi.mk.am:
  manual merge
 2005-11-05 01:32:55 +02:00
unknown
a3db4abe8b ndb - 
Fix uninit variable


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix uninit variable
 2005-10-11 14:05:13 +02:00
unknown
82fde89c70 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


support-files/mysql.spec.sh:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
 2005-10-10 17:15:25 +02:00
unknown
28a5775b08 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
 2005-10-09 19:10:19 +02:00
unknown
6666f9ba79 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
  Auto merged
 2005-10-07 17:44:58 +02:00
unknown
393b16d83b Bug #13610 Assert during sytem restart 
- corrected previous bugfix
 2005-10-07 17:08:59 +02:00
unknown
6e18e4f3e6 merge 
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Rename: ndb/src/kernel/error/ndbd_exit_codes.c -> storage/ndb/src/kernel/error/ndbd_exit_codes.c
storage/ndb/src/kernel/vm/ndbd_malloc.cpp:
  Rename: ndb/src/kernel/vm/ndbd_malloc.cpp -> storage/ndb/src/kernel/vm/ndbd_malloc.cpp
storage/ndb/src/kernel/vm/ndbd_malloc.hpp:
  Rename: ndb/src/kernel/vm/ndbd_malloc.hpp -> storage/ndb/src/kernel/vm/ndbd_malloc.hpp
storage/ndb/test/sql/test_create_drop.pl:
  Rename: ndb/test/sql/test_create_drop.pl -> storage/ndb/test/sql/test_create_drop.pl
storage/ndb/test/sql/test_range_bounds.pl:
  Rename: ndb/test/sql/test_range_bounds.pl -> storage/ndb/test/sql/test_range_bounds.pl
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Rename: storage/ndb/include/ndbd_exit_codes.h -> storage/ndb/include/mgmapi/ndbd_exit_codes.h
 2005-10-07 09:29:55 +02:00
unknown
1dc04d119f Merge 
BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
  Auto merged
ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/ndb/include/Makefile.am:
  Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SystemError.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsRef.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/error/Makefile.am:
  Auto merged
storage/ndb/src/kernel/vm/ArrayPool.hpp:
  Auto merged
storage/ndb/src/kernel/vm/CArray.hpp:
  Auto merged
storage/ndb/src/kernel/vm/ClusterConfiguration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
  Auto merged
storage/ndb/src/kernel/vm/SafeCounter.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SafeCounter.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/kernel/vm/TimeQueue.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.hpp:
  Auto merged
storage/ndb/src/kernel/vm/pc.hpp:
  Auto merged
storage/ndb/src/mgmapi/Makefile.am:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  merge
extra/perror.c:
  merge
storage/ndb/include/mgmapi/ndb_logevent.h:
  merge
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
storage/ndb/src/mgmsrv/Services.hpp:
  SCCS merged
 2005-10-07 01:12:46 +02:00
unknown
47a3ddcf2f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
 2005-10-06 12:47:41 +02:00
unknown
af01997db3 merge 
storage/ndb/tools/ndb_size.pl:
  Rename: ndb/tools/ndb_size.pl -> storage/ndb/tools/ndb_size.pl
storage/ndb/tools/ndb_size.tmpl:
  Rename: ndb/tools/ndb_size.tmpl -> storage/ndb/tools/ndb_size.tmpl
 2005-10-06 12:45:30 +02:00
unknown
cf61f514f9 bug#13610 - ndb 
incorrectly computed m_gcp_complete_rep for partial start
  gives assert in debug mode, and error in ndbapi in release


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Compute no of gcp_complete_rep that Im contributioning correctly
    by computing distinct nodes of all the buckets im handling as if all were started
 2005-10-06 11:20:19 +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
b4d5576aaf Merge mysql.com:/home/jimw/my/mysql-5.1-bdb 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


VC++Files/storage/bdb/bdb.dsp:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
 2005-09-21 10:35:19 -07:00
unknown
dd89e28a12 ndb - backport from 5.1-ndb-dd: AttributeHeader: store size in bytes 
storage/ndb/include/kernel/AttributeHeader.hpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
 2005-09-20 12:24:16 +02:00
unknown
ba02b0863d added missing hpp file for install/dist 2005-09-20 08:35:57 +02:00
unknown
84023b7bc8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-15 14:19:56 +02:00
unknown
0c3bb2f8b3 Makefile: 
new file
 2005-09-15 14:19:55 +02:00
unknown
b45d9f1c3e merge 2005-09-15 13:07:22 +02:00
unknown
8cb57f592a .del-readme.txt~b8bfcc7df24862f9: 
Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
.del-ndbapi_async.cpp~319189569fb659ec:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
.del-Makefile~79de1c081ceb33e9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
.del-Makefile~75b59c8ae729df88:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
.del-ndbapi_event.cpp~c5d949802966180:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
.del-Makefile~9b32217af2a3145:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
.del-Makefile~39711027c2d962ff:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
.del-Makefile~27fcbb1f51b14aa7:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
.del-readme.txt~c54f2dc2297fa97:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
.del-Makefile~896f3a0fcdc499eb:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
.del-Makefile~2bb0971c2e0576ef:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
.del-Makefile~8c7f0da8e0e08db6:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile


BitKeeper/deleted/.del-Makefile~8c7f0da8e0e08db6:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
BitKeeper/deleted/.del-Makefile~2bb0971c2e0576ef:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
BitKeeper/deleted/.del-Makefile~896f3a0fcdc499eb:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
BitKeeper/deleted/.del-readme.txt~c54f2dc2297fa97:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
BitKeeper/deleted/.del-Makefile~27fcbb1f51b14aa7:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
BitKeeper/deleted/.del-Makefile~39711027c2d962ff:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
BitKeeper/deleted/.del-Makefile~9b32217af2a3145:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
BitKeeper/deleted/.del-Makefile~75b59c8ae729df88:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
BitKeeper/deleted/.del-Makefile~79de1c081ceb33e9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
BitKeeper/deleted/.del-readme.txt~b8bfcc7df24862f9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
 2005-09-15 13:00:53 +02:00
unknown
519ebe2bdb merge error 2005-09-15 12:53:59 +02:00
unknown
2ff26b97f2 ndb-wl2325.patch 
storage/ndb/include/debugger/EventLogger.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/NodeInfo.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/AlterTab.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/CreateEvnt.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/CreateTab.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/DropTab.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/mgmapi/mgmapi.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/mgmapi/ndb_logevent.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/Ndb.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/NdbError.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/ndberror.h:
  Import patch ndb-wl2325.patch
storage/ndb/ndbapi-examples/Makefile:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/EventLogger.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/Makefile.am:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/SimBlockList.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/vm/Configuration.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmapi/mgmapi.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/Services.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/Services.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndb.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbWaiter.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndberr.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndbif.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ndberror.c:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/HugoOperations.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/HugoTransactions.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/NDBT_Table.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/NDBT_Test.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/Makefile.am:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankCreator.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankMakeGL.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankTimer.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/testBank.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bench/asyncGenerator.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bench/ndb_schema.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/test_event.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/test_event_multi_table.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/run-test/Makefile.am:
  Import patch ndb-wl2325.patch
storage/ndb/test/run-test/daily-devel-tests.txt:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/HugoOperations.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/HugoTransactions.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/NDBT_Tables.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/NDBT_Test.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/UtilTransactions.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/tools/Makefile.am:
  Import patch ndb-wl2325.patch
 2005-09-15 11:33:50 +02:00
unknown
67347ba37f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
 2005-09-15 11:32:49 +02:00
unknown
9a7ec9517c ndb - wl#2624 re-commit due to bk problem 
mysql-test/r/ndb_basic.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_blob.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_charset.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_condition_pushdown.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_index_ordered.result:
  wl#2624 re-commit due to bk problem
mysql-test/t/ndb_index_ordered.test:
  wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.cc:
  wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.h:
  wl#2624 re-commit due to bk problem
sql/mysqld.cc:
  wl#2624 re-commit due to bk problem
sql/set_var.cc:
  wl#2624 re-commit due to bk problem
sql/sql_class.h:
  wl#2624 re-commit due to bk problem
storage/ndb/include/kernel/AttributeHeader.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Makefile.am:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/Makefile.am:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  wl#2624 re-commit due to bk problem
 2005-09-15 02:33:28 +02:00
unknown
ee2125c919 merge 
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  Auto merged
 2005-09-14 17:58:20 +02:00
unknown
8943090c33 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new


mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
VC++Files/mysql.sln:
  Manual merge 5.0 -> 5.1
scripts/make_win_src_distribution.sh:
  Manual merge 5.0 -> 5.1
sql/field.cc:
  Manual merge 5.0 -> 5.1
 2005-09-14 09:43:56 +02:00
unknown
dca8397833 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2005-09-13 14:03:00 +02:00
unknown
0260e3dcc1 Merge 
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql/sql_table.cc:
  SCCS merged
 2005-09-13 05:33:11 +02:00
unknown
54e99aa58e Merge 
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/default.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
 2005-09-12 14:22:06 +02:00
unknown
6e1d21039b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2005-09-10 21:06:22 +02:00
unknown
3bd9f42ca6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
 2005-09-10 09:04:34 +02:00
unknown
ba677667f7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
 2005-09-09 21:05:59 +02:00
unknown
bbc293fd7c SignalSender.cpp: 
Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp
SignalSender.hpp:
  Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp


storage/ndb/src/ndbapi/SignalSender.hpp:
  Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp
storage/ndb/src/ndbapi/SignalSender.cpp:
  Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp
 2005-09-09 20:37:14 +02:00
unknown
36aeee3682 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/ndbapi/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
 2005-09-09 15:26:47 +02:00
unknown
173bdc337e 5.0->5.1 merge fix 
5.1 has moved ndb into storage


storage/ndb/test/ndbapi/testSRBank.cpp:
  Rename: ndb/test/ndbapi/testSRBank.cpp -> storage/ndb/test/ndbapi/testSRBank.cpp
 2005-09-09 13:44:48 +02:00
unknown
12dbb18815 Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2005-09-09 13:30:38 +02:00
unknown
e371b26468 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 13:27:59 +02:00
unknown
4ec11b2797 Merge 127.(none):/home/osku/mysql/5.0/12084 
into  127.(none):/home/osku/mysql/5.1/clean


sql/ha_innodb.cc:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
 2005-09-08 11:36:11 +03:00
unknown
c8cb9b1191 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
 2005-09-06 12:50:30 +02:00
unknown
5ac4b63188 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
 2005-09-06 09:21:23 +02:00
unknown
f6c1d4191c Merge 
Makefile.am:
  Auto merged
BitKeeper/etc/config:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.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_parse.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/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/include/page0page.ic:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
sql/log_event.cc:
  SCCS merged
sql/sql_prepare.cc:
  SCCS merged
sql/share/errmsg.txt:
  merge
 2005-09-06 09:20:15 +02:00
unknown
616df8931f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  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/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
 2005-09-06 06:52:06 +02:00
unknown
7cbc039c9e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_extra.c:
  Auto merged
storage/ndb/include/kernel/signaldata/FsRef.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  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/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/sql_acl.cc:
  Merge 5.0 -> 5.1
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  Merge 5.0 -> 5.1
 2005-09-02 08:59:59 +02:00
unknown
008f4121d5 merge 
BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.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_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
 2005-08-31 20:45:48 +02:00
unknown
4ba6640503 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  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/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
 2005-08-27 07:42:59 +02:00
unknown
da862ab927 Merge fixes 
storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp:
  Rename: ndb/include/kernel/signaldata/ApiBroadcast.hpp -> storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp
storage/ndb/src/kernel/vm/KeyDescriptor.hpp:
  Rename: ndb/src/kernel/vm/KeyDescriptor.hpp -> storage/ndb/src/kernel/vm/KeyDescriptor.hpp
 2005-08-25 14:52:21 -04:00
unknown
5c0dc1ace8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
  Auto merged
BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
  Auto merged
BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
  Auto merged
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
  Auto merged
BitKeeper/etc/config:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.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_parse.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.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/innobase/btr/btr0pcur.c:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/row/row0umod.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_static.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/include/kernel/BlockNumbers.h:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/kernel_types.h:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/portlib/NdbTCP.h:
  Auto merged
storage/ndb/src/common/debugger/BlockNames.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/Makefile.am:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  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/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Manual 5.0 - 5.1 merge
configure.in:
  Manual 5.0 - 5.1 merge
sql/mysql_priv.h:
  Manual 5.0 - 5.1 merge
sql/share/errmsg.txt:
  Manual 5.0 - 5.1 merge
sql/sql_base.cc:
  Manual 5.0 - 5.1 merge
sql/sql_prepare.cc:
  Manual 5.0 - 5.1 merge
storage/ndb/src/common/util/version.c:
  Manual 5.0 - 5.1 merge
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  Manual 5.0 - 5.1 merge
 2005-08-25 13:11:38 -04:00
unknown
5088fefb63 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/jonas/src/mysql-5.1-push


mysql-test/t/ndb_partition_key.test:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
 2005-08-08 22:21:43 +02:00
unknown
d6dcd1bfcd Fixed ndb_config problems with merge 
storage/ndb/tools/ndb_condig.cpp:
  Rename: ndb/tools/config.cpp -> storage/ndb/tools/ndb_condig.cpp
storage/ndb/tools/Makefile.am:
  Rename due to mixed names with no case sensitivity
 2005-08-05 18:45:03 -04:00
unknown
aca6f88ebb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/etc/config:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/default.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/read0types.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0srv.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/myisam/mi_create.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Manual merge 5.0 -> 5.1
mysql-test/t/alter_table.test:
  Manual merge 5.0 -> 5.1
sql/share/errmsg.txt:
  Manual merge 5.0 -> 5.1
storage/ndb/tools/Makefile.am:
  Manual merge 5.0 -> 5.1
 2005-08-05 18:01:34 -04:00
unknown
aec81618fe Fix bug introduced, attempted an optimisation not very successfully 2005-07-27 13:18:30 -04:00
unknown
6d1bd0292b Fixes 2005-07-27 11:26:37 -04:00
unknown
6cc3eee46e wl2405.patch 
storage/ndb/include/ndbapi/Ndb.hpp:
  Import patch wl2405.patch
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Import patch wl2405.patch
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Import patch wl2405.patch
storage/ndb/include/portlib/NdbThread.h:
  Import patch wl2405.patch
storage/ndb/src/common/portlib/NdbThread.c:
  Import patch wl2405.patch
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/Ndb.cpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/NdbWaiter.hpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/Ndbif.cpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Import patch wl2405.patch
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Import patch wl2405.patch
 2005-07-26 17:12:05 +02:00
unknown
74371fd2e9 ndb - 
fix length of NDB$PK in unique index table


storage/ndb/tools/config.cpp:
  Rename: ndb/tools/config.cpp -> storage/ndb/tools/config.cpp
sql/ha_innodb.h:
  fix g++ compile error
sql/ha_ndbcluster.h:
  fix g++ compile error
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  fix length of NDB$PK in index table
 2005-07-26 15:05:05 +02:00
unknown
34f1aabc0e Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.1-push


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  merge
 2005-07-25 10:18:15 +02:00
unknown
4894026840 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/test/include/UtilTransactions.hpp:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2005-07-22 23:15:51 +02:00
unknown
7c56453297 corrected errorcodes to be in right range 2005-07-22 23:15:45 +02:00
unknown
a3f76cf54e Fixed error codes 2005-07-22 17:12:51 -04:00
unknown
828a7021e7 Bug #12114 patch 
mysql-test/r/ndb_partition_error.result:
  New test program
mysql-test/t/ndb_partition_error.test:
  New test program
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fixed error handling after CREATE_FRAGMENTATION_REF
 2005-07-22 16:39:05 -04:00
unknown
134b853648 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-22 15:16:37 +02:00
unknown
2e2936839c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
 2005-07-22 15:01:11 +02:00
unknown
e3dc82439b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/include/kernel/NodeInfo.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterCallback.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
 2005-07-22 14:50:19 +02:00
unknown
bc4e384358 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/slave.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_printer.hpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
 2005-07-22 13:53:59 +02:00
unknown
804375463f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/Users/mikron/mysql-5.1
 2005-07-22 12:15:03 +02:00
unknown
37a4780d70 Fixed error in constants 
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Set up node group information as default if no node group info is
  passed in create table message.
 2005-07-22 10:57:36 +02:00
unknown
ba9e3542d4 Merge mysql.com:/home/jimw/my/mysql-5.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-bdb


sql/ha_berkeley.cc:
  Auto merged
 2005-07-21 18:04:55 -07:00
unknown
24ae2eb0e0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/innobase/include/sync0sync.h:
  Auto merged
storage/innobase/sync/sync0sync.c:
  Auto merged
 2005-07-22 02:56:25 +02:00