compatible with 4.1.9


configure.in:
  bumped up ndb version

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.

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

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

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

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


scripts/mysqlaccess.sh:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove 8k->32k conversion
ndb/src/kernel/vm/Configuration.cpp:
  compute size in 32k pages directly

  Use the invisible tabs (!)


libmysql/libmysql.def:
  Use the invisible tabs (!)
libmysqld/libmysqld.def:
  Use the invisible tabs (!)

  Add missing 'get_defaults_files' to fix linking error.


libmysql/libmysql.def:
  Add missing 'get_defaults_files' to fix linking error.
libmysqld/libmysqld.def:
  Add missing 'get_defaults_files' to fix linking error.

sql/ha_berkeley.cc:
  Skip allocation of hash and lock on error

of log_10 array.


sql/field.cc:
  Avoid pointless calculation for really short fields, and what could be
  an attempt to access outside the bounds of the log_10 array.

absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)


sql/field.cc:
  Fix handling of negative values and fabs(values> < 1 in Field_str::store
mysql-test/r/type_float.result:
  Add results
mysql-test/r/type_float.result.es:
  Add results
mysql-test/t/type_float.test:
  Add test for conversion of floats to character field

sql/sql_parse.cc:
  A shorter name for COM_EXECUTE command.

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

reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit)

mysql-test/t/analyse.test:
  Added a note about the bug that this test case tests.
sql/sql_analyse.cc:
  Changed function description to standard format.

into build.mysql.com:/users/tulin/mysql-4.1