sql/item_sum.cc:
  Auto merged

(Change done by Ramil and sent via IRC)

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

sql/my_decimal.h:
  Refixing the valgrind warning in decimal.c:sanity() in a different way
  (as requested by Monty): we want to let valgrind see uninitialized
  memory whenever it's possible.
strings/decimal.c:
  Fix sanity() to not look into possibly uninitialized memory if
  HAVE_purify.

innobase/include/data0type.ic:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge.

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

mysql-test/r/federated.result:
  made sure result has SLAVE_PORT!
mysql-test/t/federated.test:
  added --replace_result to a table creation that I forgot to add before

"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.


client/mysqltest.c:
  We should not issue "SHOW WARNINGS" if we have not processed all 
  results from multi-statement.

  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.


sql/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.
mysql-test/t/func_group.test:
  Added a test case for bug #9210.

sql/my_decimal.h:
  HAVE_purify is defined in valgrind-max build as well: one possible 
  solution is to disable the sanity check in decimal.c in the valgrind-max
  build, but it's better to have more checks than less, for
  valgrind-max builds are not always used in conjunction with valgrind.

tests/mysql_client_test.c:
  Cleanup, remove some -ansi -pedancit warnings.

innobase/include/data0type.ic:
  Fix for sorting of innodb TEXT columns.

been killed.


mysql-test/r/kill.result:
  Update results
mysql-test/t/kill.test:
  Fix 'ping' to be '--ping' and make test that this is a new
  connection actually test that.

sql/item_sum.cc:
  Remove C_MODE_START/END around function, add cast

(patch from lenz, reapplied by jimw)


support-files/mysql.spec.sh:
  removed MyISAM RAID from the Linux "Max" RPMs

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


libmysql/libmysql.c:
  Make implicit cast explicit
myisam/mi_open.c:
  Make cast of value to smaller data size explicit
myisam/mi_packrec.c:
  Cast file size (my_off_t) to size_t for mmap
mysys/my_mmap.c:
  Fix Windows version of my_mmap() to use the right parameters
  for call to CreateFileMapping()
sql/field.cc:
  Use temporary value of correct type
sql/field.h:
  Use query_id_t for query_id value
sql/ha_berkeley.cc:
  Fix flag check
sql/ha_innodb.h:
  Use query_id_t for query_id value
sql/handler.cc:
  Explain opt_using_transactions calculation, and add cast
sql/handler.h:
  Fix forward declaration of COND
sql/item.cc:
  Fix val_bool() tests of val_int() to avoid implicit cast
sql/item_cmpfunc.cc:
  Fix typo in switch label
sql/item_func.cc:
  Make implicit cast explicit
sql/item_strfunc.cc:
  Now that query_id is a query_id_t, need to cast it to a ulong here
sql/item_subselect.cc:
  Fix test of value
sql/log.cc:
  Cast my_off_t used for file size to size_t for memory allocation
  Also cast my_off_t when using it to calculate the number of pages for TC log
  Cast total_ha_2pc to uchar when saving it
sql/mysql_priv.h:
  Move up query_id definition so it can be used more widely
sql/opt_range.cc:
  Add unused delete operator to prevent compiler warning
sql/set_var.cc:
  Cast value for max_user_connections
sql/sql_cache.cc:
  Remove unused label
sql/sql_class.h:
  Fix query id values to be of type query_id_t
sql/sql_db.cc:
  Move variable only used inside #ifdef within the #ifdef
sql/sql_help.cc:
  Remove unused label
sql/sql_insert.cc:
  Use query_id_t for query id values
sql/sql_lex.h:
  Add unused delete operator to prevent compiler warning
sql/sql_select.cc:
  Remove unused variable
  Make cast of value explicit
sql/sql_select.h:
  Use query_id_t for query id values
sql/sql_table.cc:
  Make comparison to function pointer explicit
sql/sql_update.cc:
  Use query_id_t for query id values
sql/table.h:
  Use query_id_t for query id values
strings/ctype-simple.c:
  Add cast of long value to (char) in expression
strings/ctype-ucs2.c:
  Add cast of long value to (char) in expression
strings/ctype-utf8.c:
  Make cast to smaller size explicit

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


innobase/include/data0type.h:
  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


innobase/include/data0type.ic:
  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


sql/sql_parse.cc:
  Auto merged

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

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


Build-tools/Do-compile:
  Auto merged

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


Build-tools/Do-compile:
  Auto merged

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

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


Build-tools/Do-compile:
  Auto merged

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


Build-tools/Do-compile:
  Auto merged

mysql-test/r/sp.result:
  New test case for BUG#6600.
mysql-test/t/sp.test:
  New test case for BUG#6600.
sql/sp_head.cc:
  Added yet another multiple result set statement to the list.
sql/sql_parse.cc:
  Have to invalidate SP caches in CHECK TABLE, or it will produce very
  strange results when called in SPs.

  Disabled old feature to disable test cases


mysql-test/mysql-test-run.sh:
  Disabled old feature to disable test cases

into mysql.com:/M50/build-5.0.3


Build-tools/Do-compile:
  Auto merged

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


mysql-test/r/sp_trans.result:
  Changed procedure name and delimiter setting to follow the style of the other SP test files.
mysql-test/t/sp-error.test:
  Added comment with hint for bug test case style.
mysql-test/t/sp-threads.test:
  Added comments, with hint for bug test case style.
mysql-test/t/sp.test:
  Removed have_innodb.inc inclusion.
  Added comments about different SP test files, table usage and
  hint for bug test case style.
mysql-test/t/sp_trans.test:
  Changed procedure name and delimiter setting to follow the style of the other SP test files.

Build-tools/Do-compile:
  SCCS merged

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.


mysql-test/r/grant2.result:
  Added more ACL tests and fixed results in some old tests.
mysql-test/t/grant2.test:
  Added more ACL tests and fixed results in some old tests.
sql/sql_acl.h:
  Made check_acl_user() visible to sql_parse.cc
sql/sql_parse.cc:
  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

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/olap.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Auto merged