into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build

  New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated


mysql-test/r/grant.result:
  results updated
mysql-test/r/grant2.result:
  results updated
mysql-test/r/sp.result:
  results updated
mysql-test/r/system_mysql_db.result:
  results updated
mysql-test/t/grant2.test:
  new tests (mostly backported from jani's patch)
scripts/mysql_create_system_tables.sh:
  Create_user_priv added
scripts/mysql_fix_privilege_tables.sql:
  Create_user_priv added
sql/sql_acl.cc:
  Create_user_priv added
sql/sql_acl.h:
  Create_user_priv added
sql/sql_parse.cc:
  Create_user_priv added
sql/sql_show.cc:
  Create_user_priv added
sql/sql_yacc.yy:
  Create_user_priv added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

  InnoDB needs longer start time for second slave on slow hosts


mysql-test/mysql-test-run.pl:
  InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
  InnoDB needs longer start time for second slave on slow hosts

server-tools/instance-manager/instance.cc:
  Revert the inclusion of 'signal.h' as this module contains 'kill()'.

into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build

included before any other include) was hidden from me.


server-tools/instance-manager/commands.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/commands.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/factory.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/guardian.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/guardian.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_map.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_map.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_options.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/log.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/manager.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/messages.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/messages.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/mysql_connection.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/mysqlmanager.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/options.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/parse.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/parse_output.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/protocol.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/protocol.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/thread_registry.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/user_map.h:
  Fix for AIX compilation failure & cleanup

sql/item_func.cc:
  Remove unused variable
sql/handler.cc:
  Fix warnings
sql/item_sum.cc:
  Restore C_MODE_START/END around count_distinct_walk
  Change second argument to dump_leaf_key to correct type
sql/item_sum.h:
  Change second argument to dump_leaf_key to correct type

BitKeeper/deleted/.del-MySqlManager_ia64.dsp~179439d0832c941e:
  Delete: VC++Files/mysqlmanager/MySqlManager_ia64.dsp
VC++Files/mysql.dsw:
  Remove MySqlManager and references to it
VC++Files/mysql_ia64.dsw:
  Remove references to MySqlManager

libmysqld/libmysqld.def:
  Bump version number, add two symbols
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Fix target name
  Remove unwanted dependency

  5.0.3 is a beta


configure.in:
  5.0.3 is a beta

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

  Added 'proc' and 'procs_priv' tables, updated others


mysql-test/lib/init_db.sql:
  Added 'proc' and 'procs_priv' tables, updated others

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


mysql-test/mysql-test-run.pl:
  Auto merged

(Change done by Ramil and sent via IRC)

  Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log


mysql-test/mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
  Made --timer work

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.

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

  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

Build-tools/Do-compile:
  SCCS merged

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

sql/sql_select.cc:
  Post-merge correction

  transactional test removed
sp_trans.test, sp_trans.result:
  new file


mysql-test/r/sp.result:
  transactional test removed
mysql-test/t/sp.test:
  transactional test removed

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

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

libmysql/libmysql.c:
  Break up variable definitions to appease HP/UX compiler.

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