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

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

"Warnings on 'drop procedure' platform-specific").

In mysqltest we should not issue "SHOW WARNINGS" until we have not 
read results from all statements in multi-statement.

Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
error and thus will ruin current connection (but we may not notice this as
it happened in sp.test because we ignore errors from such auxilary
SHOW WARNINGS and use auto-reconnecting connections) or will
succeed but consume first packet from next statement in multi-statement
sequence (this happens if "SHOW WARNINGS" is issued when this packet
is already received by client. Packet is thrown away by net_clear()
call which is issued when "SHOW WARNINGS" is sent to server).

In our case sp.test failed because usually we had first situation
but sometimes second situation occured causing warning to pop-up.

  Added a test case for bug #9210.
sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP BY expression was decimal.
  Slightly optimized the other code.

been killed.

(patch from lenz, reapplied by jimw)

Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)

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

  The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs

  Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT

into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

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

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

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

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

into mysql.com:/M50/mysql-5.0

  Disabled old feature to disable test cases

into mysql.com:/M50/build-5.0.3

and removed a have_innodb.inc inclusion which was left by mistake
in an earlier change.

Added new logic to ACL system:

1) If GRANT OPTION (not mysql db):
   Ok to update existing user, but not password.
   Not allowed to make a new user.

2) If UPDATE_ACL to mysql DB:
   Ok to update current user, but not make a new one.

3) If INSERT_ACL to mysql DB:
   Ok to add a new user, but not modify existing.

4) If GRANT OPTION to mysql DB:
   All modifications OK.

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

  Added a test case for bug #8617.
sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.

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

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