into sinisa.nasamreza.org:/mnt/work/mysql-4.1

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

sql/item.cc:
  Fixed Bug#8009.

into mdk10.(none):/home/reggie/bk/41test2

BitKeeper/deleted/.del-reserved_win_names.test~334b02776c4247a7:
  Delete: mysql-test/t/reserved_win_names.test
BitKeeper/deleted/.del-reserved_win_names.require~be6a130b5430085f:
  Delete: mysql-test/r/reserved_win_names.require
BitKeeper/deleted/.del-reserved_win_names.result~ea458226c0df5337:
  Delete: mysql-test/r/reserved_win_names.result

into xiphis.org:/usr/home/antony/work2/p3-bug7241.5

  Only acquire necessary write lock for multi-delete


mysql-test/r/lock.result:
  Test for Bug#7241
mysql-test/t/lock.test:
  Test for Bug#7241
sql/sql_parse.cc:
  Bug#7241
    Don't acquire write lock on all tables.
    Make sure to set lock_type on real table_list

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

fixups of test case and comment formatting


BitKeeper/deleted/.del-reserved_win_names-master.opt~e56da049a7ce9a5b:
  ***MISSING TEXT***
mysql-test/r/lowercase_table.result:
  added my test for bug #9148 to this test case
mysql-test/t/lowercase_table.test:
  added my test for bug #9148 to this test case
mysys/my_fopen.c:
  reformatted comments
mysys/my_open.c:
  reformatted comments

This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.

ha_myisammrg.cc:
  Replaced missing / in format string
my_getwd.c:
  Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison


mysys/my_getwd.c:
  Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
sql/ha_myisammrg.cc:
  Replaced missing / in format string

into mdk10.(none):/home/reggie/bk/mysql-4.1

This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.



sql/ha_myisammrg.cc:
  removed the patch applied earlier
strings/my_vsnprintf.c:
  removed the patch applied earlier.  The patch was to add %c ability.  
  Monty has already done this.

include/my_global.h:
  icc does not define __ICC when emulating gcc. Use __INTEL_COMPILER to check for icc.
ndb/src/cw/cpcd/Process.cpp:
  Remove rlimit64
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Remove dirent64

This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.


myisammrg/myrg_open.c:
  use fn_format to convert pathnames if the files in the merge file have a pathname
mysys/my_getwd.c:
  add a test for '/' in the code that determines if a string inlucdes a pathname

This is a second patch needing another review.  The first patch didn't solve
the entire problem.  open and fopen on Windows will still open
files like "com1.sym" when they shouldn't.  This patch
checks that the file exists before trying to open it.



mysys/my_fopen.c:
  on Windows, if we are not creating a file the we call my_access to make sure the
  file exists before trying to open it.
mysys/my_open.c:
  on Windows, if we are not creating a file the we call my_access to make sure the
  file exists before trying to open it.

The problem was that on Windows the access method indicates that access to file 
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.

The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.


VC++Files/mysys/mysys.dsp:
  added my_access
VC++Files/mysys/mysys_ia64.dsp:
  added my_access.c
include/my_sys.h:
  if on windows, we use my_access.
  if not on windows, then my_access points to the native access method
mysys/Makefile.am:
  added my_access to mysys build file
mysys/mf_pack.c:
  changed call to access to my_access
sql/sql_db.cc:
  changed call to access to my_access

into mysql.com:/usr/home/ram/work/mysql-4.1

myisam/sp_key.c:
  a fix (bug #10757: gis-rtree.test fails)
  float8get() doesn't properly work with local variables sometimes.

This patch was submitted by Ingo and it appears to work correctly.


sql/ha_myisammrg.cc:
  use FN_LIBCHAR instead of / so buff works correctly on Windows
strings/my_vsnprintf.c:
  add support for %c to my_vsnprintf

sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function


sql/sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function

into mysql.com:/usr/home/ram/work/mysql-4.1

sql/spatial.cc:
  just float8get doesn't work well with the local variables -                     
  they can be of processor-specific floating type - not the                       
  standard decimal (by hf)

mysql-test/r/rpl_log.result:
  Adding File_size to output of SHOW BINARY lOGS
mysql-test/r/rpl_rotate_logs.result:
  Adding File_size to output of SHOW BINARY lOGS
sql/sql_repl.cc:
  Adding File_size to output of SHOW BINARY lOGS

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

sql/unireg.cc:
  Auto merged

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

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

when reporting an error, use an appropriate buffer for udf->name

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

After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().


mysql-test/r/merge.result:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  The test result.
mysql-test/t/merge.test:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  The test case does not in all cases show the problem
  without the bugfix. The improper memory allocation
  might get through undetected in many cases.
sql/ha_myisammrg.h:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Set a table_flag for the MERGE engine telling that any index
  might be unique without being specified as such.
sql/handler.h:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Added a new table_flag telling that any index
  might be unique without being specified as such.
sql/sql_insert.cc:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Changed the freeing of the memory to be symmetric to its
  allocation (my_safe_alloc -> my_safe_afree).
  This is not directly related to the bug.
sql/table.cc:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Added a condition for MERGE tables. These do not have unique
  indexes. But every key could be a unique key on the underlying
  MyISAM table. So get the maximum key length for MERGE tables
  instead of the maximum unique key length. This is used for
  buffer allocation in write_record().

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1