sql/sql_parse.cc:
  Auto merged

mysql-test/r/sp.result:
  fixing results for new test
mysql-test/t/sp.test:
  making a new test with autocommit set to 0 and 1.
  Second CALL is in autocommit mode to prove that the relevant bug 
  (bug #8550) is fixed.

  Add dummy changelog file. It should merge upward without conflict.

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/M50/mysql-5.0


include/my_sys.h:
  Auto merged

Build-tools/Do-compile:
  Change already present in 5.0
configure.in:
  Do not propagate a 4.0 version number to the 5.0 tree.
include/my_sys.h:
  Change already present in 5.0.
mysys/hash.c:
  For Sun compilers, 'static inline' is ok.
mysys/my_bitmap.c:
  Change already present in 5.0
sql/item_strfunc.cc:
  Change already present in 5.0
sql/net_serv.cc:
  Change already present in 5.0

into mysql.com:/home/pem/work/mysql-5.0

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

Reverted Jim's patch.


client/mysql.cc:
  Fixed Bug#8922, The deilimeter cannot be reset after it is set as word 'delimiter'
include/my_sys.h:
  Reverted Jim's patch.
mysys/mf_iocache.c:
  Reverted Jim's patch.
sql/sql_class.h:
  Reverted Jim's patch.

innobase/include/srv0srv.h:
  Declare those variables as ulong that are declared in ha_innodb.h
innobase/srv/srv0srv.c:
  Define those variables as ulong that are declared in ha_innodb.h

- bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
  as 4.0.24)


configure.in:
  - bumped up version number from 4.0.24 -> 4.0.25

into mysql.com:/home/pem/work/mysql-5.0

into hundin.mysql.fi:/home/marko/mysql-5.0

(lost in merge because the code to open these logs was moved to a different
file).


sql/sql_class.h:
  Use APPEND_CACHE for query log and slow log (so they can be FIFO)

include/my_sys.h:
  Auto merged
mysys/mf_iocache.c:
  Auto merged

into hundin.mysql.fi:/home/marko/mysql-5.0

mysql-test/r/sp.result:
  New test case for BUG#8937.
mysql-test/t/sp.test:
  New test case for BUG#8937.
sql/item_sum.h:
  Added val_int() method for Item_sum_avg for forced int types (in SPs for instance),
  otherwise Item_sum_sum::val_int() is used.

mysql-test/r/cast.result:
  test result
mysql-test/r/func_group.result:
  test result
mysql-test/t/cast.test:
  test case
sql/field.cc:
  this assert isn't correct actually

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0.7498

mysql-test/r/sp.result:
  Reorganized tests (all bugs at the end now) and made some tests adopt to the file's style.
mysql-test/t/sp.test:
  Reorganized tests (all bugs at the end now) and made some tests adopt to the file's style.

Build-tools/Do-compile:
  Backport of a change Lenz did in 4.1 (without it, Solaris sends empty mails):
  
  Improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.

into hundin.mysql.fi:/home/marko/mysql-5.0

  row_search_for_mysql(): Add a clarifying comment.


innobase/row/row0sel.c:
  row_search_for_mysql(): Add a clarifying comment.

innobase/include/row0vers.h:
  row_vers_build_for_consistent_read():
  Add parameters offsets and offset_heap
  in order to avoid recomputing the offsets in the caller.
innobase/row/row0sel.c:
  Eliminate some rec_get_offsets() calls.
innobase/row/row0vers.c:
  row_vers_build_for_consistent_read():
  Add parameters offsets and offset_heap
  in order to avoid recomputing the offsets in the caller.

mysql-test/r/func_group.result:
  test result fixed
mysql-test/t/func_group.test:
  testcase added

Actually problem was not in AVG function, but in SUM before the AVG in the
query.


mysql-test/r/func_group.result:
  appropriate test result
mysql-test/t/func_group.test:
  test case added
strings/decimal.c:
  in this case we also need to make fsizes equal

(whereas it's 0 in 4.1, for safety as this is new code).


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

into mysql.com:/home/svoj/devel/mysql/ft-mysql-5.0

  ut_malloc_low(): fix the fprintf() format string
  (an extraneous comma split the format into two arguments)


innobase/ut/ut0mem.c:
  ut_malloc_low(): fix the fprintf() format string
  (an extraneous comma split the format into two arguments)

myisam/ft_boolean_search.c:
  quot, qend not needed anymore, removed.
  phrase initialization moved to ft_init_boolean_search.
  comments added.
  _ftb_strstr renamed to _ftb_check_phrase.
myisam/ft_parser.c:
  style improvements.

The patch implements the idea suggested by Olaf van der Spek in 
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving 
one-column tables.


BUILD/SETUP.sh:
  Remove --with-vio option which no longer exist.
BUILD/compile-pentium64-valgrind-max:
  Remove --with-vio option which no longer exist.
config/ac-macros/misc.m4:
  Removed --with-vio configure switch: we always use VIO. The switch,
   in fact, only saved us one pointer dereferencing per call in case we had
  only one transport type in VIO enabled.
config/ac-macros/openssl.m4:
  Removed HAVE_VIO.
include/config-win.h:
  Removed HAVE_VIO (not needed anymore)
  Added HAVE_VIO_READ_BUFF (define buffered client reads for Windows clients).
include/violite.h:
  Removed HAVE_VIO, as currently VIO is always in use.
  Added declaration for vio_read_buff and related members in struct VIO.
sql-common/client.c:
  Use flags to set up vio read buffering in mysql_real_connect.
sql/mysqld.cc:
  Use flags to disable vio read buffering when creating a server 
  connection.
vio/vio.c:
  Optionally set up vio read buffer when creating a new VIO structure.
vio/viosocket.c:
  Implementation of client-side buffered reads in VIO: the idea 
  is to buffer small reads in a client buffer to save amount of
  syscalls per retrieved result set. The implementation relies
  on the fact that read/recv will return as soon as there is
  some data in the kernel buffer, no matter how big the given
  user's buffer is. To be able to disable it in case recv/read don't
  have such semantics, the new calls are guarded
  with #define HAVE_VIO_READ_BUFF. Currently buffered reading is 
  switched on only for BSD sockets and named pipes, both on Windows
  and UNIXes.

stored  procedure,  it  is converted  to DELETE.


mysql-test/r/sp.result:
  A result for  the  test  case  for bug #8850
mysql-test/t/sp.test:
  A test  case  for the bug #8850
sql/sql_delete.cc:
  A fix for bug  #8850, plus adding a missing call  to mysql_init_select(),
  which  caused mem_root corruption.
sql/sql_parse.cc:
  A fix for the bug #8850
BitKeeper/etc/ignore:
  Added acinclude.m4 to the ignore list

  Comment changes: use standard style; fix grammar.


sql/sql_udf.cc:
  Comment changes: use standard style; fix grammar.

  after merge fixes


mysql-test/r/func_group.result:
  after merge fixes
mysql-test/r/func_str.result:
  after merge fixes
mysql-test/t/func_group.test:
  after merge fixes

into mysql.com:/home/bar/mysql-5.0

BitKeeper/etc/logging_ok:
  auto-union
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/func_system.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
innobase/ut/ut0mem.c:
  e
  merge from 4.1
mysql-test/r/func_group.result:
  merge from 4.1
mysql-test/r/func_str.result:
  merge from 4.1
mysql-test/t/func_group.test:
  merge from 4.1

into mysql.com:/home/dlenev/src/mysql-5.0-sp


sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged