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

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

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


sql/sql_lex.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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

mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/item_cmpfunc.cc:
  manual merge
sql/item_func.cc:
  no changes

mysql-test/include/have_ndb.inc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge

  fixed start-and-exit flag


mysql-test/mysql-test-run.sh:
  fixed start-and-exit flag

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


sql/item.cc:
  Auto merged

into mysql.com:/home/my/mysql-4.1


sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

(BUG 8216)


mysql-test/r/group_by.result:
  New test case
mysql-test/r/user_var.result:
  Test changed (to be more correct) with bug fix
mysql-test/t/group_by.test:
  Added test for HAVING bug
sql/item_cmpfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_func.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_row.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_strfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/unireg.h:
  Added PSEUDO_TABLES_BITS for easy testing of real table reference

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967.extra1

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


support-files/mysql.spec.sh:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  removed typo
  moved pre to post for directory creation
  add changelog comments


support-files/mysql.spec.sh:
  removed typo
  moved pre to post for directory creation
  add changelog comments

sql/slave.cc:
  Ensure that slaves have normal COMMIT behaviour

into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

sql/ha_ndbcluster.cc:
  Added a pthread_exit before thread exists
sql/ha_ndbcluster.h:
  Changed storage of commit_count from uint to ulonglong

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


BUILD/compile-solaris-sparc-purify:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0

  corrected typo


mysql-test/t/ndb_basic.test:
  corrected typo

  Set CCLD as well


BUILD/compile-solaris-sparc-purify:
  Set CCLD as well

into mysql.com:/home/jonas/src/mysql-5.0

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

BitKeeper/etc/ignore:
  Added support-files/ndb-config-2-node.ini to the ignore list

into mysql.com:/home/jonas/src/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

sql/ha_ndbcluster.cc:
  SCCS merged

  corrected typo in previous changeset


sql/ha_ndbcluster.cc:
  corrected typo in previous changeset

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


sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

  Minor tweaks to work properly


Build-tools/Do-solaris-pkg:
  Minor tweaks to work properly

sql/ha_ndbcluster.cc:
  merge