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

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


libmysqld/examples/Makefile.am:
  Auto merged

libmysqld/examples/Makefile.am:
  Remove MT_INCLUDE

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

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

mysql-test/r/func_gconcat.result:
  Test result fixed.
sql/item_sum.cc:
  Cleanup of Item_func_group_concat:
  - last unobvious things commented
  - don't store NULLs in the tree.
  - remove unneeded variables.
  - use setup_order, not setup_group to setup group concat order list
sql/item_sum.h:
  Cleanup for Item_func_group_concat: remove unneded variables, methods,
  move a bunch of variables to private: section.

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


mysql-test/t/sp.test:
  Auto merged

  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:/space/my/mysql-5.0


sql/sql_parse.cc:
  Auto merged

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

into sinisa.nasamreza.org:/mnt/work/petica

into sinisa.nasamreza.org:/mnt/work/petica

  Fix for a bug with test failing with Classic.


mysql-test/t/sp.test:
  Fix for a bug with test failing with Classic.

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

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

heap/hp_create.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_string.h:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/func_gconcat.result:
  Manual merge
mysql-test/r/func_str.result:
  Manual merge
mysql-test/t/func_gconcat.test:
  Manual merge
sql/ha_heap.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

sql/key.cc:
  Auto merged
mysql-test/r/update.result:
  SCCS merged
mysql-test/t/update.test:
  SCCS merged

sql/key.cc:
  A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
  For "partial" key parts (e.g. key(a(20), ...) we create different
  key_part->field, see sql/table.cc; so we have to use the eq() 
  function here to compare fields.

First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.

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

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/item.h:
  Auto merged

reconnect setting in mysql client library. (Bug #8866)


client/mysqltest.c:
  Make sure reconnect is always set on connections, and
  note that there is a test that relies on this

tests/mysql_client_test.c:
  Fix data type of variable used in bind

Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup).


BitKeeper/deleted/.del-mysqlfs.m4~2c0a06625ffdef2:
  Delete: config/ac-macros/mysqlfs.m4
Makefile.am:
  Removed fs_dir (since dropping mysqlfs support)
configure.in:
  Removed support for MySQLFS.
  Gone is support for mit-threads.
  Gone is Raid.
  I feel like if I say "gone" one more time I should embed a secret country song somewhere in the source as an easter egg.
dbug/Makefile.am:
  Removed mit-threads
extra/Makefile.am:
  Removed mit-threads
heap/Makefile.am:
  removed mit-threads
libmysql_r/Makefile.am:
  removed mit-threads
libmysqld/Makefile.am:
  removed mit-threads
myisam/Makefile.am:
  remove mt-threads
myisammrg/Makefile.am:
  removed mit-threas
mysys/Makefile.am:
  removed mit-threads
regex/Makefile.am:
  removed mit-treads
sql/Makefile.am:
  removed mit-threads
strings/Makefile.am:
  removed mit-threads
tests/Makefile.am:
  removed mit-threads
tools/Makefile.am:
  removed mit-threads

  Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.


sql/sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
mysql-test/t/olap.test:
  Added a test for bug #8615.
mysql-test/r/olap.result:
  Added a test for bug #8615.

mysql-test/r/federated.result:
  merge
sql/ha_federated.cc:
  merge

Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP


mysql-test/include/varchar.inc:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/r/innodb.result:
  Added varchar tests
mysql-test/r/myisam.result:
  Update results
mysql-test/t/bdb.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/t/innodb.test:
  Enabled VARCHAR testing
mysql-test/t/myisam.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
sql/sql_parse.cc:
  Indentation fixes
sql/sql_table.cc:
  Fixed bug introduced when doing cleanup