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

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

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

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

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)

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.

  Comment changes: use standard style; fix grammar.

  after merge fixes

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

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

Improved handling of situations when we encounter error during
CREATE PROCEDURE (FUNCTION/TRIGGER/...) and bail out of yyparse()
without restoring proper THD::lex.

  Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.

into deer.(none):/home/hf/work/mysql-5.0.8915

into deer.(none):/home/hf/work/mysql-5.0.8915

Made mysql_make_view() to call destructor for st_lex_local objects before
throwing them away (this happens in case of error).

  If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary

  Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0

  write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
  will commit at every 10,000 copied rows.

and some SP-related cleanups.

- We don't have separate stage for calculation of list of tables
  to be prelocked and doing implicit LOCK/UNLOCK any more.
  Instead we calculate this list at open_tables() and do implicit
  LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
  Also now we support cases when same table (with same alias) is
  used several times in the same query in SP.

- Cleaned up execution of SP. Moved all common code which handles
  LEX and does preparations before statement execution or complex
  expression evaluation to auxilary sp_lex_keeper class. Now 
  all statements in SP (and corresponding instructions) that
  evaluate expression which can contain subquery have their
  own LEX.

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

  fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.

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

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