libmysql/libmysql.c:
  This is a fix for a bug in connect_timeout.
  
  This bug manifested itself on operating systems that do support poll() 
  system call, which resulted in a timeout twice the value specified.
  
  That is because timeout executed on both select() and poll().

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

mysql-test/r/type_datetime.result:
  result for datetime fix
mysql-test/t/type_datetime.test:
  test for datetime fix
sql/sql_select.cc:
  Fix for a bug caused implicitely by MySQL having to comply with 
  ODBC standard on datetime comparisons.
  
  This failed to update used_tables() for OR condition, which is why
  query returned all rows on query as in .test above, while
  none of types contains NULL nor 0 datetime (last one from ODBC)

 - add version number to build log files (e.g. Logs/build-4.1-standard.log)
 - add host name and uname to Subject line of build failure mails
   (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")

 -> Please merge with all other trees!


Build-tools/Do-compile:
  Small enhancements:
   - add version number to build log files (e.g. Logs/build-4.1-standard.log)
   - add host name and uname to Subject line of build failure mails
     (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")

   the --password parameter (better add it to my.cnf instead) (Thanks to
   Christian Hammers for the suggestion)


scripts/mysqlhotcopy.sh:
   - added word of warning about providing the password as cleartext using
     the --password parameter (better add it to my.cnf instead)

   address to report bugs to bugs@mysql.com (thanks to Christian Hammers
   for pointing this out) - please merge this into all other trees!


scripts/mysqlaccess.sh:
   - Yves mail address does not seem to be valid anymore - changed mail
     address to report bugs to bugs@mysql.com (thanks to Christian Hammers
     for pointing this out)

  Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query


sql/ha_innobase.cc:
  Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query

   and actually results in an error with very recent autoconf versions!
   (see http://www.gnu.org/manual/autoconf/html_node/autoconf_165.html or
    "AC_LIBOBJ vs. LIBOBJS" in the autoconf documentation)
   Please merge this into 4.0 as well!

Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
This fixes some Errcode 13 errors on Windows when deleting tables.



sql/mysql_priv.h:
  Moved lower case conversion of database names to check_db_name()
sql/mysqld.cc:
  Fix to be able to use 4.0 error message files
sql/sql_db.cc:
  Moved lower case conversion of database names to check_db_name()
sql/sql_parse.cc:
  Moved lower case conversion of database names to check_db_name()
  Added checking of lower_case_table_names for mysql_table_dump() and
  mysql_list_fields()
sql/sql_show.cc:
  Moved lower case conversion of database names to check_db_name()
sql/table.cc:
  Convert database names to lower case in check_db-name() if --lower-case-table-names is used.

made bisone 1.75 compatible code


mysql-test/r/group_by.result:
  test of function with agregate function inside
mysql-test/t/group_by.test:
  test of function with agregate function inside
sql/item_cmpfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_cmpfunc.h:
  fixed functions to be able work with group function as argument
sql/item_func.cc:
  fixed functions to be able work with group function as argument
sql/item_func.h:
  fixed functions to be able work with group function as argument
sql/item_strfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_strfunc.h:
  fixed functions to be able work with group function as argument
sql/sql_yacc.yy:
  made bisone 1.75 compatible code
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/sql_base.cc:
  S

libmysql/libmysql.c:
  Make PACKET_TOO_LARGE error handling safer

  Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table


innobase/btr/btr0cur.c:
  Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table

   now maintained in a separate "mysqldoc" BK source tree) - it will be
   replaced with the correct manual.texi when building the official
   source distribution
 - fixed automake error about reservedwords.texi by moving it to EXTRA_DIST
   instead


Docs/Makefile.am:
   - moved reservedwords.texi from info_TEXINFOS to EXTRA_DIST since it is
     not a full-featured texi file and automake would complain about
     "missing @setfilename"
Docs/manual.texi:
   - replaced manual.texi with a dummy placeholder file (manual.texi is
     now maintained in a separate "mysqldoc" BK source tree) - it will be
     replaced with the correct manual.texi when building the official
     source distribution

   so it's part of the distribution (manual.texi includes this file)
   It will be replaced with the correct one from the mysqldoc tree before
   building the distribution
 - removed generation and inclusion of MIRRORS file, since the mirror list
   is no longer part of manual.texi anyway
 - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
 - Redirect standard error when checking for dpkg-architecture in ltconfig
   to avoid error message showing during configuration


Docs/Makefile.am:
   - added reservedwords.texi (which gets included by manual.texi)
   - removed MIRRORS (mirror list is not part of the manual anymore)
Docs/reservedwords.texi:
   - Updated wording a bit after adding it to the tree
Makefile.am:
   - removed MIRRORS from EXTRA_DIST (it's not part of the manual anymore)
ltconfig:
   - Redirect standard error when checking for dpkg-architecture
     to avoid error message showing during configuration (thanks to
     John Wythe for the patch)
sql/Makefile.am:
   - replaced YFLAGS with AM_YFLAGS to make automake happy

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

 - tagged ChangeSet 1.1315 as "mysql-3.23.55"


configure.in:
   - bump up version number 3.23.55 -> 3.23.56

 - use "gnutar" on Mac OS X to build the binary distribution


Build-tools/Do-compile:
   - merged relevevant changes from 4.0 (Options no-mysqltest, no-benchmark,
     log_timestamp function)
scripts/make_binary_distribution.sh:
   - make sure to use "gnutar" (on Mac OS X) to pack up the binary distribution
     (Mac OS X "tar" seems to be buggy - the resulting tarballs appear to be
     corrupted, e.g. when opening them with Midnight Commander. GNU tar seems
     to extract them correctly, though)

   twice, if --enabable-thread-safe-client is enabled, which broke RPM
   building)


Makefile.am:
   - reverted previous patch and removed libmysql_r from SUBDIRS again
     (it will automatically be added when --enable-thread-safe-client is
     used)

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


sql/log.cc:
  Auto merged

  The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits


innobase/os/os0file.c:
  The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits

  Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table


sql/ha_innobase.cc:
  Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table

  Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows


innobase/os/os0file.c:
  Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows

This fixes a possible core dump problem in SHOW PROCESSLIST


sql/slave.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
  Also first set query_length, then query
sql/sql_parse.cc:
  Indentation changes

into hundin.mysql.fi:/home/heikki/mysql

  Backport from 4.0: fix bug in adaptive hash index search


innobase/btr/btr0sea.c:
  Backport from 4.0: fix bug in adaptive hash index search

(like FLUSH TABLES).
(Code is already in 4.0)


sql/log.cc:
  Fixed bug with the --slow-log when logging an administrator command
  (like FLUSH TABLES).

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

  Backport from 4.0: fix the BLOB hang if the index tree is of height 1


innobase/row/row0purge.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/btr/btr0btr.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/include/btr0btr.h:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1

  Backport from 4.0: fix possible adaprive hash index latch hang


sql/ha_innobase.cc:
  Backport from 4.0: fix possible adaprive hash index latch hang