sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/Makefile.am:
  Manual merge
sql/log.cc:
  Manual merge

Renamed Table_filter to Rpl_filter
Eliminated very annoying memory leak


sql/Makefile.am:
  Renamed Table_filter to Rpl_filter
sql/log.cc:
  Renamed Table_filter to Rpl_filter
sql/log_event.cc:
  Renamed Table_filter to Rpl_filter
sql/mysqld.cc:
  Renamed Table_filter to Rpl_filter
  Eliminated very annoying memory leak
sql/repl_failsafe.cc:
  Renamed Table_filter to Rpl_filter
sql/slave.cc:
  Renamed Table_filter to Rpl_filter
sql/slave.h:
  Renamed Table_filter to Rpl_filter
sql/sql_acl.h:
  Renamed Table_filter to Rpl_filter
sql/sql_parse.cc:
  Renamed Table_filter to Rpl_filter
sql/sql_repl.cc:
  Renamed Table_filter to Rpl_filter
sql/rpl_filter.cc:
  Renamed Table_filter to Rpl_filter
sql/rpl_filter.h:
  Renamed Table_filter to Rpl_filter
sql/sql_repl.h:
  Renamed Table_filter to Rpl_filter

BitKeeper/etc/logging_ok:
  auto-union
sql/sql_acl.h:
  Auto merged

  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.

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

  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.


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

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

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

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

sql/sql_select.cc:
  Post-merge correction

into zim.(none):/home/brian/mysql/mysql-5.1


configure.in:
  Auto merged

into zim.(none):/home/brian/mysql/mysql-5.1


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
configure.in:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged

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

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

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