sql-bench/server-cfg.sh:
  Set max number of tables to create in NDB to 32

- Close an open scan if index_read is called without closing the previous one.
- Removed some errors that occured during previous merge


include/mysqld_error.h:
  Added two new error messages for NDB
sql/ha_ndbcluster.cc:
  Added more error code mappings, from NDB code to MySQL 
  Added function to print out the error message when an NDB error occurs.
  Added two new error codes, which will represent either a permanent or temporary NDB error.
  Modev get_ndb_lock_type from class to local function
  Removed some merge errors
  New function close_scan, to close an open scan.
sql/ha_ndbcluster.h:
  Added print_error function, overrides handler::print_error
  Added close_scan
  Moved get_ndb_lock_type from class to local function
sql/share/czech/errmsg.txt:
  Added two new error messages for NDB
sql/share/danish/errmsg.txt:
  Added two new error messages for NDB
sql/share/dutch/errmsg.txt:
  Added two new error messages for NDB
sql/share/english/errmsg.txt:
  Added two new error messages for NDB
sql/share/estonian/errmsg.txt:
  Added two new error messages for NDB
sql/share/french/errmsg.txt:
  Added two new error messages for NDB
sql/share/german/errmsg.txt:
  Added two new error messages for NDB
sql/share/greek/errmsg.txt:
  Added two new error messages for NDB
sql/share/hungarian/errmsg.txt:
  Added two new error messages for NDB
sql/share/italian/errmsg.txt:
  Added two new error messages for NDB
sql/share/japanese/errmsg.txt:
  Added two new error messages for NDB
sql/share/korean/errmsg.txt:
  Added two new error messages for NDB
sql/share/norwegian-ny/errmsg.txt:
  Added two new error messages for NDB
sql/share/norwegian/errmsg.txt:
  Added two new error messages for NDB
sql/share/polish/errmsg.txt:
  Added two new error messages for NDB
sql/share/portuguese/errmsg.txt:
  Added two new error messages for NDB
sql/share/romanian/errmsg.txt:
  Added two new error messages for NDB
sql/share/russian/errmsg.txt:
  Added two new error messages for NDB
sql/share/serbian/errmsg.txt:
  Added two new error messages for NDB
sql/share/slovak/errmsg.txt:
  Added two new error messages for NDB
sql/share/spanish/errmsg.txt:
  Added two new error messages for NDB
sql/share/swedish/errmsg.txt:
  Added two new error messages for NDB
sql/share/ukrainian/errmsg.txt:
  Added two new error messages for NDB

ndb/test/ndbapi/testScan/testScan.cpp:
  Added test case for "slow" scanning if one node is down

ndb/src/ndbapi/NdbScanOperation.cpp:
  Set error code on "parent" NdbConnection

Added two new, ndb_replace and ndb_minmax


mysql-test/r/ndb_index.result:
  Disable query, since index used is case sensitive
mysql-test/r/ndb_index_ordered.result:
  Correct faulty CREATE TABLE statement
mysql-test/r/ndb_index_unique.result:
  Correct faulty CREATE TABLE statement
mysql-test/t/ndb_index.test:
  Disable query, since index used is case sensitive
mysql-test/t/ndb_index_ordered.test:
  Correct faulty CREATE TABLE statement
mysql-test/t/ndb_index_unique.test:
  Correct faulty CREATE TABLE statement

into neptunus.(none):/home/magnus/mysql-4.1


sql/sql_table.cc:
  Auto merged

sql/ha_ndbcluster.h:
  Auto merged

BitKeeper/deleted/.del-regression.sh~c19f771726612629:
  Delete: ndb/bin/regression.sh
sql/ha_ndbcluster.cc:
  Change index flags, remove HA_WRONG_ASCII_ORDER and HA_ONLY_WHOLE_INDEX.
  HA_WRONG_ASCII_ORDER was used in field::optimize_range and if it was set, the index was hardly ever used.
  Correct check of start_key and start_key->flag != HA_READ_KEY_EXACT, ignore end-Key in suc a case
  Updated implementation o read_range_first
  Made the calculation of number of bytes par batch easier to underatsn and easier to configure. The value bytesperbatch can be made a config variable.
  AReduce the number of bytes sent per batch, don't overload.
  Increase the value returned from scan_time in order to make it clear to optimizer that scanning is the worst alternative. Always use index if available.

into hundin.mysql.fi:/home/marko/j/mysql-4.1

mysql-test/r/ndb_basic.result:
  Updated ndb_basic for better coverage
mysql-test/t/ndb_basic.test:
  Updated ndb_basic for better coverage

sql/ha_ndbcluster.cc:
  Modified next_result to process fetched records cached in NdbApi before asking NDB for more. 
  It should also NoCommit any pending operations before contacting NDB again.
  Added utility function define_read_attrs to set the fields that should be read.
sql/ha_ndbcluster.h:
  Add function define_read_attrs, used to set the fields to read
  Add get_nd_lock_type funciton ,to convert MySQL lock type to NDB lock type
  Always compile filtered scan function even if it's not used yet.
  Add variable ops_pending to keep track of "pending" update/delete operations.

into neptunus.(none):/home/magnus/mysql-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/sql_table.cc:
  Auto merged

to allow binding of userland functions in PHP.


include/mysql.h:
  added new last parameter (void *) for mysql_set_local_infile_handler
  st_mysql_options:
    added void *local_infile_userdata
    added last parameter (void *) for local_infile_init function pointer
libmysql/libmysql.c:
  added parameter userdata in mysql_set_local_infile_handler
  added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init
  passed additional parameter userdata to init function in handle_local_infile
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/sql_table.cc:
  Auto merged

into mysql.com:/home/mydev/mysql-4.1-wl1687


sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

  Czech collations were renamed to _cs
Index.xml:
  Czech collation were renamed to _cs


sql/share/charsets/Index.xml:
  Czech collation were renamed to _cs
strings/ctype-czech.c:
  Czech collations were renamed to _cs
strings/ctype-win1250ch.c:
  Czech collations were renamed to _cs

Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB)

into mysql.com:/home/my/mysql-4.1


libmysql/libmysql.c:
  Auto merged

Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)


configure.in:
  Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
extra/my_print_defaults.c:
  Fixed wrong definition for 'verbose'
include/my_global.h:
  Portability fix (IRIX64)
libmysql/client_settings.h:
  Remove compiler warnings
libmysql/libmysql.c:
  Remove compiler warnings
mysql-test/r/func_str.result:
  Updated results
mysql-test/r/key_cache.result:
  Updated results to not depend on key_blocks_unused
mysql-test/t/func_str.test:
  More test of long overflow
mysql-test/t/key_cache.test:
  Updated results to not depend on key_blocks_unused
sql/item.cc:
  Portability fix (don't use strtoll())
sql/item.h:
  Portability fix (don't use strtoll())
sql/item_sum.h:
  Portability fix (don't use strtoll())
sql/item_timefunc.cc:
  Fixed compiler warning
strings/ctype-simple.c:
  Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
strings/ctype-ucs2.c:
  Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems

into hegel.local:/home/miguel/bk/mysql-4.1

sql/set_var.cc:
  VC++ error compiler compatibility

into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1

sql/sql_lex.h:
  description of field
sql/sql_union.cc:
  layout fixed

item_list for fake_select will be created only once
(problem reported by valgrind in test_union2 fixed)


sql/sql_lex.h:
  new function to keep code in one place
sql/sql_union.cc:
  fake_select_lex should be prepared during PS preparation to work correctly
  item_list for fake_select will be created only once

into mysql.com:/space/my/mysql-4.1-build

   that was accidently added by the last BK auto merge


VC++Files/client/mysqlclient.dsp:
   - removed duplicate file ..\strings\strxnmov.c that was added by the
     last auto merge

libmysql/libmysql.c:
  Make advanced_command check client reply
sql/sql_prepare.cc:
  mysql_stmt_reset now sends ok/error reply to the client.
tests/client_test.c:
  Memory leak fixed.

into mysql.com:/home/pem/work/mysql-4.1

sql/handler.h:
  Fixed (portability) bug. No qualified method names in the class definition.
sql/item_cmpfunc.h:
  Attempt to silence cast warnings on some platforms.
sql/item_subselect.h:
  Attempt to silence cast warnings on some platforms.
sql/set_var.cc:
  Silence warning (missing cast).
sql/spatial.h:
  Attempt to silence cast warnings on some platforms.
sql/sql_cache.cc:
  Silence warning (wrong cast).
sql/sql_lex.h:
  Attempt to silence cast warnings on some platforms.

into mysql.com:/home/my/mysql-4.1

   files, fixed linking of myisam_ftdump


VC++Files/client/mysqlclient.dsp:
   - added strings/ctype.uca.c
VC++Files/libmysql/libmysql.dsp:
   - added strings/ctype.uca.c
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
   - added zlib to the link line
VC++Files/sql/mysqld.dsp:
   - added discover.cpp
VC++Files/strings/strings.dsp:
   - added strings/ctype.uca.c

sql/set_var.cc:
  Fix VC++ compiler error

HEAP: Copies the key count to a backup variable and sets the key count to zero.
That way, no HEAP function will ever try to touch any index.
Re-enabling is done by copying back the backup variable.
To avoid memory leak at table close, disable deletes all index trees.
Re-enabling must be done with empty indexes and data anyway. Otherwise,
the indexes would need to be repaired, wich HEAP is not capable of.
MyISAM: Only the key_map is cleared and set.
Re-enabling must be done with empty indexes and data. Otherwise, repair needs
to be done which will enable all keys persistently.
The former implementation disabled only non-unique keys and maked this persistent.
The new implementation additionally can disable all keys, but only without
making this persistent. Re-enabling all keys can be done without repair,
if data file and indexes are empty.


heap/heapdef.h:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Pulled hp_clear_keys() out of hp_clear().
heap/hp_clear.c:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Pulled hp_clear_keys() out of hp_clear().
  Added the new functions for disabling and enabling keys and to ask for the key state.
include/heap.h:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Added a new HP_SHARE element to save the key count while keys are disabled.
  Added declarations for the new functions.
myisam/mi_open.c:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Added the new functions for disabling and enabling keys and to ask for the key state.
myisam/myisamdef.h:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Added declarations for the new functions.
sql/ha_heap.cc:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Pulled set_keys_for_scanning() out of open().
  Added the new functions for disabling and enabling keys and to ask for the key state.
sql/ha_heap.h:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Added declarations for the new functions.
sql/ha_myisam.cc:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Extended disable_indexes() for all keys and no save.
  The argument is now 'mode' as it must handle different cases.
  Extended enable_indexes() for no save.
  The new feature needs the new argument 'mode' with the same semantics as in disable_indexes().
  Added indexes_are_disabled() to ask for the key state.
  Extended the existing call to enable_indexes() by the new argument.
sql/ha_myisam.h:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Modified the declarations of dis-/enable_indexes() for the new argument.
  Added the declaration of the new function to ask for the key state.
sql/handler.h:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Added declarations for the operation modes for the key switching functions.
  Modified the declarations of dis-/enable_indexes() for the new argument.
  Added the declaration of the new function to ask for the key state.
sql/sql_select.cc:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  In create_myisam_from_heap() take notice of disabled keys
  and disable them in the new table before copying the data.
sql/sql_table.cc:
  WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
  Modified the calls of dis-/enable_indexes() for the new argument.

innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/rpl_server_id2.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/slave.cc:
  Merge with 4.0

tests/client_test.c:
  Few cleanups

sql/sql_acl.cc:
  Auto merged

into hundin.mysql.fi:/home/marko/j/mysql-4.1


mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/home/my/mysql-4.1