Fix for the resize key cache operation.


include/keycache.h:
  Fix for the resize key cache operation.
mysys/mf_keycache.c:
  Fix for the resize key cache operation.

into mysql.com:/home/kostja/mysql/mysql-4.1-root

sql/ha_isammrg.cc:
  no Bitmap::operator=(ulonglong) present

  Fix the OS error 2 reported by Miguel and Mark in Windows crash recovery: a * had been forgotten from the path in directory scanning
ha_innodb.cc:
  Set default directory in fil0fil.c right if we are running the Embedded Server Library, where the default dir of the process is not necessarily the MySQL datadir


sql/ha_innodb.cc:
  Set default directory in fil0fil.c right if we are running the Embedded Server Library, where the default dir of the process is not necessarily the MySQL datadir
innobase/os/os0file.c:
  Fix the OS error 2 reported by Miguel and Mark in Windows crash recovery: a * had been forgotten from the path in directory scanning

Fixed tests for RAID tables
Detect uninitialized mutexes on lock and destroy


mysql-test/r/raid.result:
  Updated results
mysql-test/r/rpl_change_master.result:
  Update results missing from last patch
mysql-test/t/raid.test:
  Clean up test
mysys/mf_iocache.c:
  Comments
  Small safety fix
mysys/thr_mutex.c:
  Detect uninitialized mutexes on lock and destroy
sql/sql_db.cc:
  Fixed memory leak with RAID tables

BUILD/compile-pentium-debug-max:
  s

into deer.(none):/home/hf/work/mysql-4.1.1727


mysql-test/r/derived.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged

into ice.snake.net:/Users/paul/mysql-4.1


mysql-test/r/rpl_loaddata.result:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

Portability fixes
After merge fixes


VC++Files/mysql.dsw:
  Added dependencys
VC++Files/mysys/mysys.dsp:
  Add missing files
client/mysqlcheck.c:
  Added comment
client/mysqltest.c:
  Remove not used variables
include/keycache.h:
  Removed not used element
include/m_ctype.h:
  Portability fix
include/my_base.h:
  Removed not used define
myisam/mi_keycache.c:
  Added mutex for extra safety
mysql-test/r/count_distinct3.result:
  Faster test
mysql-test/r/rpl_change_master.result:
  updated results
mysql-test/t/count_distinct3.test:
  Faster test
mysql-test/t/rpl_change_master.test:
  Make test repeatable
mysys/default.c:
  Remove compiler warning
mysys/mf_keycache.c:
  Removed not used 'action' element
mysys/my_getopt.c:
  Remove not used variable
sql/ha_myisam.cc:
  Remove compiler warning
sql/item.cc:
  Fixed wrong patch from last changeset
sql/item_timefunc.cc:
  Remove compiler warnings
sql/set_var.cc:
  Remove compiler warnings
sql/sql_prepare.cc:
  Remove not used variables
sql/sql_repl.cc:
  After merge fix
sql/sql_select.h:
  Added comments
sql/sql_table.cc:
  Remove not used define
strings/ctype-tis620.c:
  Remove not used variables

mysql-test/r/bigint.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged

The right way to fix this is to change the Field::store(longlong) method to be
Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0


mysql-test/r/bigint.result:
  New tests to show how the last bigint patch broke MySQL
mysql-test/t/bigint.test:
  New tests to show how the last bigint patch broke MySQL
sql/item.cc:
  Revert patch for bigint handling in double context as it broke normal bigint handling
sql/item.h:
  Revert patch for bigint handling in double context as it broke normal bigint handling

Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER


BitKeeper/etc/ignore:
  auto-union
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Merge with 4.0
sql/item.cc:
  Merge with 4.0 to get fix for storing negative values in decimal fields
sql/item.h:
  Merge with 4.0 to get fix for storing negative values in decimal fields
sql/sql_handler.cc:
  Merge with 4.0 to get fix for FLUSH TABLE with HANDLER
sql/sql_repl.cc:
  Merge with 4.0
sql/sql_select.cc:
  Used original file.
  (Comments moved to sql/sql_select.h)

into mysql.com:/my/mysql-4.1


sql/item_cmpfunc.cc:
  Auto merged

Fixed compiler warnings (IRIX C compiler and VC++)


VC++Files/client/mysqlclient.dsp:
  Add missing file to project
VC++Files/libmysql/libmysql.dsp:
  Add missing file to project
VC++Files/myisam/myisam.dsp:
  Add missing file to project
VC++Files/mysys/mysys.dsp:
  Add missing file to project
heap/hp_test1.c:
  Fixed wrong call to heap_rkey()
heap/hp_test2.c:
  Fixed wrong call to heap_rkey()
include/hash.h:
  Move not used (internal) struct to hash.c
include/my_pthread.h:
  Made some structs 'const char*' to avoid warnings
include/my_sys.h:
  Moved key cache structs and functions to keycache.h
include/myisam.h:
  Merge key cache structures to one
include/mysql.h:
  Remove STDCALL from internal functions
include/sql_common.h:
  Remove STDCALL from internal functions
include/violite.h:
  Fixed compiler warning
isam/_locking.c:
  Merge key cache structures to one
isam/_page.c:
  Merge key cache structures to one
isam/close.c:
  Merge key cache structures to one
isam/extra.c:
  Merge key cache structures to one
isam/isamchk.c:
  Merge key cache structures to one
isam/isamdef.h:
  Merge key cache structures to one
isam/isamlog.c:
  Merge key cache structures to one
isam/panic.c:
  Merge key cache structures to one
isam/test2.c:
  Merge key cache structures to one
isam/test3.c:
  Merge key cache structures to one
libmysql/client_settings.h:
  Remove STDCALL from internal functions
libmysql/libmysql.c:
  Remove STDCALL from internal functions
myisam/ft_boolean_search.c:
  Fixed compiler warning
myisam/ft_dump.c:
  Fixed compiler warnings (%qx is not portable)
myisam/ft_update.c:
  Fixed compiler warnings
myisam/mi_check.c:
  Merge key cache structures to one
myisam/mi_close.c:
  Merge key cache structures to one
myisam/mi_delete_all.c:
  Merge key cache structures to one
myisam/mi_extra.c:
  Merge key cache structures to one
myisam/mi_keycache.c:
  Merge key cache structures to one
myisam/mi_locking.c:
  Merge key cache structures to one
myisam/mi_page.c:
  Merge key cache structures to one
myisam/mi_panic.c:
  Merge key cache structures to one
myisam/mi_preload.c:
  Merge key cache structures to one
myisam/mi_test1.c:
  Merge key cache structures to one
myisam/mi_test2.c:
  Merge key cache structures to one
myisam/mi_test3.c:
  Merge key cache structures to one
myisam/myisamchk.c:
  Merge key cache structures to one
myisam/myisamdef.h:
  Merge key cache structures to one
myisam/myisamlog.c:
  Merge key cache structures to one
  Removed not used option
myisam/sort.c:
  Fixed compiler warnings
myisam/sp_test.c:
  Fixed compiler warnings
mysql-test/r/case.result:
  Updated results after fix of correct NULL detection in WHEN
mysql-test/r/date_formats.result:
  Updated results after fixing date handling
mysql-test/r/symlink.result:
  Updated results after adding DEFAULT CHARSET
mysql-test/t/case.test:
  New test
mysql-test/t/symlink.test:
  Updated error numbers
mysys/hash.c:
  Made HASH_LINK struct local
mysys/mf_keycache.c:
  Merge key cache structures to one
  Fixed key_cache_read() and key_cache_write() to be resize-safe.
mysys/mf_keycaches.c:
  Merge key cache structures to one
mysys/thr_mutex.c:
  Added test if mutex is initalized
sql-common/client.c:
  Remove STDCALL from internal functions
sql/derror.cc:
  Added comment
sql/field.cc:
  Removed not used variables
sql/ha_innodb.cc:
  Fixed compiler warnings (removed not used variables)
sql/ha_myisam.cc:
  Merge key cache structures to one
sql/ha_myisammrg.cc:
  Removed not used variables
sql/handler.cc:
  Merge key cache structures to one
sql/handler.h:
  Merge key cache structures to one
sql/item.cc:
  Fixed compiler warning
sql/item_cmpfunc.cc:
  Remove not used variables
sql/item_func.cc:
  Remove not used variables
sql/item_strfunc.cc:
  Removed not used variables
sql/item_sum.cc:
  Removed not used variables
  Moved setting of item_thd to fix_fields()
sql/item_timefunc.cc:
  Removed not used variables
sql/mysql_priv.h:
  Merge key cache structures to one
sql/mysqld.cc:
  Merge key cache structures to one
  init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used
sql/opt_sum.cc:
  Remove not used variables
sql/protocol.cc:
  Don't send errors after ok has been sent
sql/protocol_cursor.cc:
  Remove not used variable
  Simple optimization
sql/repl_failsafe.cc:
  Remove not used variables
sql/set_var.cc:
  Merge key cache structures to one
sql/set_var.h:
  Merge key cache structures to one
sql/sql_acl.cc:
  Remove not used variables
sql/sql_base.cc:
  Remove not used function
sql/sql_db.cc:
  Remove not used variables
sql/sql_handler.cc:
  Remove not used variables
sql/sql_insert.cc:
  More DBUG statements
  Simple code cleanup
sql/sql_lex.cc:
  Remove not used variables
sql/sql_parse.cc:
  Remove not used variables
sql/sql_prepare.cc:
  Remove not used variables
sql/sql_repl.cc:
  Remove not used variables
sql/sql_select.cc:
  Remove not used variables
sql/sql_show.cc:
  Remove not used variables
sql/sql_table.cc:
  Merge key cache structures to one
  Removed not used variables
sql/sql_test.cc:
  Merge key cache structures to one
sql/strfunc.cc:
  Fixed that find_type() returns correct value for partly matched words.
  (This fixed the error found by date_formats.test)
sql/time.cc:
  Remove not used variables
strings/my_strtoll10.c:
  Fixed compiler warnings

into ice.snake.net:/Users/paul/mysql-4.1

for SHOW SLAVE STATUS.

(Initial caps for each word.) For example, instead of writing
Until_condition, Until_Log_File, and Until_log_pos, write
Until_Condition, Until_Log_File, and Until_Log_pos.


mysql-test/r/rpl000015.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_empty_master_crash.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_error_ignored_table.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_flush_log_loop.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_loaddata.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_log.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_log_pos.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_max_relay_size.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_openssl.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_redirect.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_replicate_do.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_reset_slave.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_rotate_logs.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_trunc_binlog.result:
  Write slave status field names using consistent style.
mysql-test/r/rpl_until.result:
  Write slave status field names using consistent style.
mysql-test/t/mix_innodb_myisam_binlog.test:
  Write slave status field names using consistent style.
mysql-test/t/rpl_max_relay_size.test:
  Write slave status field names using consistent style.
sql/slave.cc:
  Write slave status field names using consistent style.

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

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

into mashka.mysql.fi:/home/my/mysql-4.1

Add missing file to VC++ project


VC++Files/mysys/mysys.dsp:
  Add new file to project
include/my_sys.h:
  Remove old variables
sql/set_var.h:
  Portability fix

include/my_base.h:
  Portability fix
include/my_global.h:
  Portability fix for AIX43
  (Having _Export gave a lot of errors/warnings and I think this is not needed anymore)
include/my_sys.h:
  Remove compiler warning on AIX43 with xlc_r compiler
include/mysql.h:
  Portability fix
innobase/fil/fil0fil.c:
  Fixed compiler warnings (xlc_r)
libmysql/libmysql.c:
  Portability fix
strings/my_strtoll10.c:
  Portability fix (for AIX43)

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

has (in mysql-test-run) a slave-net-timeout=10. So the 'sleep 1' below
was converted in 'sleep 10', so slave thought that connection was down,
so reconnected, so got an additional (fake) Rotate event, which shifted
the positions displayed by SHOW SLAVE STATUS.

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

minor fixups: more verbose on "no memory" errors - report requested size, avoid flushing rec buffer to a file that is closed and deleted already (on got_error=1)

   setting LIBS to include @openss_libs@ (BUG#1652)

into mashka.mysql.fi:/home/my/mysql-4.1

Changed ~Item_func_in() to call cleanup() (to fix memory leak)
Fixed test_multi_statements() test in client_test


include/mysql.h:
  Changed mysql_next_result() to return int instead of bool
libmysql/libmysql.c:
  Changed mysql_next_result() to return int instead of bool
  Added check to mysql_next_result() to ensure that it's not called in wrong context.
sql/item_cmpfunc.cc:
  Indentation fixes
sql/item_cmpfunc.h:
  Changed ~Item_func_in() to call cleanup()
  (Fixed memory leak in cmp_item_row())
tests/client_test.c:
  Fixed test_multi_statements() test.

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  There were errors in cp850: in unicode, ctype and sort arrays


sql/share/charsets/cp850.xml:
  There were errors in cp850: in unicode, ctype and sort arrays

mysys/mf_keycache.c:
  Fixed C syntax error.

sql/sql_yacc.yy:
   - added a missing comma (maybe a merge error?)

more user variable tests


mysql-test/r/user_var.result:
  more user variable tests (just to have this behaviour written down somewhere)
mysql-test/t/user_var.test:
  more user variable tests (just to have this behaviour written down somewhere)
sql/sql_handler.cc:
  Bug#1826, HANDLER+ALTER TABLE=crash
  (unfortunately, it cannot be tested in mysql-test suite)