BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
heap/hp_create.c:
  Auto merged
heap/hp_write.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/data/data0type.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Use local values
mysql-test/r/ps_1general.result:
  Update results
mysql-test/t/func_gconcat.test:
  no changes
mysql-test/t/ps_1general.test:
  Use local code
ndb/src/common/util/version.c:
  Use local code
sql/filesort.cc:
  Empty line changes
sql/ha_heap.cc:
  Merge
sql/item_timefunc.cc:
  Keep local code
sql/mysql_priv.h:
  Update to 5.0
sql/sql_show.cc:
  Hand merge
support-files/mysql.spec.sh:
  No changes

BitKeeper/etc/ignore:
  added ndb/include/ndb_types.h

BUILD/compile-solaris-sparc-purify:
  Cleanup (Changes from Kent)
include/m_string.h:
  New interface for my_strtod()
mysql-test/mysql-test-run.sh:
  Added option --use-old-data to allow one to run a test case on an existing table
  (Good for debugging)
mysql-test/r/strict.result:
  Updated results
mysql-test/r/type_float.result:
  More tests
mysql-test/t/strict.test:
  Safety fix
mysql-test/t/type_float.test:
  More tests
mysys/mf_iocache.c:
  Change flush_io_cache() to my_b_flush_io_cache()
  More debugging
mysys/thr_lock.c:
  Added comment
sql/field.cc:
  Use new my_strntod()
sql/filesort.cc:
  Indentation fixes
sql/item.cc:
  Use new my_strntod()
sql/item_strfunc.cc:
  Use new my_strntod()
sql/item_sum.cc:
  Use new my_strntod()
strings/ctype-cp932.c:
  strnncollsp was missing one argument
strings/ctype-simple.c:
  Use new my_strntod()
strings/ctype-ucs2.c:
  Use new my_strntod()
strings/strtod.c:
  Changed interface:
  - Force user to supply pointer to end of string (eliminates the need for an end \0)
  - More strict error checking (depend less off if INF is set), which makes this more portable
  - Better handling of numbers of type 0.000000....E+...
  - Return pointer to + in case of '+.'
  
  The above should fix a that strict.test failed on Solaris-sparc.

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

  Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.


sql/item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
mysql-test/t/func_gconcat.test:
  Added a test case for bug #7769.
mysql-test/r/func_gconcat.result:
  Added a test case for bug #7769.

include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
mysys/mf_iocache.c:
  SCCS merged

include/my_sys.h:
  Added function to call if IO_CACHE is moved
mysys/mf_iocache.c:
  Added function to call if IO_CACHE is moved
sql/filesort.cc:
  Tell that io_cache is moved

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

heap/hp_create.c:
  limit HEAP table size with max_heap_table_size
heap/hp_write.c:
  limit HEAP table size with max_heap_table_size
include/heap.h:
  limit HEAP table size with max_heap_table_size
sql/ha_heap.cc:
  limit HEAP table size with max_heap_table_size
  better estimation for mem_per_row

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

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

scripts/mysql_install_db.sh:
  Merge changes

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

support-files/mysql.spec.sh:
  - replaced obsoleted "BuildPrereq" with "BuildRequires" instead

compatible with 4.1.9


configure.in:
  bumped up ndb version

  --with-cluster are provided. Yes, this sounds like a contradiction -
  enabling debugging in NBD enables code parts that may still reveal 
  portability issues when compiled with non-gcc compilers. (request by TomasU)

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


innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

into mysql.com:/home/dlenev/src/mysql-4.1-dtbug

into mysql.com:/home/dlenev/src/mysql-4.1-dtbug


sql/sql_yacc.yy:
  Auto merged

strings/ctype-uca.c:
  fix C++ comments in C file

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

The bug was that if you have two TL_WRITE_DELAYED at the same time,
mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.


sql/mysql_priv.h:
  Fix bug in insert delayed with prepared statements
sql/sql_base.cc:
  Fix bug in insert delayed with prepared statements
sql/sql_prepare.cc:
  Fix bug in insert delayed with prepared statements
  The bug was that if you have two TL_WRITE_DELAYED at the same time,
  mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.

it has been specified. (Bug #7347)


scripts/mysql_install_db.sh:
  When basedir is specified, look for libexecdir relative to that

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

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


sql/sql_parse.cc:
  Auto merged

  Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables


sql/ha_innodb.cc:
  Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables

innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  SCCS merged

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


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

key algorithm for keys where they were explicitly specified.


mysql-test/r/show_check.result:
  Add results
mysql-test/t/show_check.test:
  Add tests for preservation of key algorithm in SHOW CREATE TABLE output

  Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables


sql/ha_innodb.cc:
  Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables

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

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


sql/field.cc:
  Auto merged

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

into hundin.mysql.fi:/home/marko/k/mysql-4.0

at run-time, so that an executable compiled on Mac OS X 10.2 can
be run on Mac OS X 10.2 (without the work-around) and Mac OS X 10.3
and later with the work-aroud enabled.


innobase/include/srv0start.h:
  Mac OS X: Add srv_have_fullfsync
innobase/os/os0file.c:
  os_file_flush(): Use F_FULLFSYNC on Mac OS X 10.3, but not on 10.2
innobase/srv/srv0start.c:
  innobase_start_or_create_for_mysql(): When compiled on OS X 10.2,
  detect if the binary is running on OS X 10.3 or later, and set
  srv_have_fullfsync accordingly.

- tagged ChangeSet 1.2207 as "mysql-4.1.9"


configure.in:
  - bumped up the version number from 4.1.9 to 4.1.10

on whether running with or without valgrind.

into mysql.com:/home/dlenev/src/mysql-4.1-dtbug