into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

sql/sql_parse.cc:
  Simplification of code

into fred.bitbike.com:/home/arjen/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  test for subselect explain bug
mysql-test/t/subselect.test:
  test for subselect explain bug

sql/sql_select.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
heap/_check.c:
  Merge: Fixed DBUG_PRINT() usage

into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_lex.h:
  Auto merged

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/Makefile.am:
  Auto merged

mysql-test/r/subselect.result:
  test of cteate temporary field of subselect bug
mysql-test/t/subselect.test:
  test of cteate temporary field of subselect bug

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

client/mysql.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of multi-level EXPLAIN
mysql-test/t/subselect.test:
  test of multi-level EXPLAIN

Docs/manual.texi:
  added text for fixes
mysql-test/r/multi_update.result:
  new test case for multi-table deletes
mysql-test/t/multi_update.test:
  new test case for multi-table deletes
sql/sql_delete.cc:
  fix for multi-table deletes
sql/sql_update.cc:
  fix for multi-table updates

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

mysql-test/r/subselect.result:
  test of subselect * bug
mysql-test/t/subselect.test:
  test of subselect * bug

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_class.cc:
  Auto merged

mysql-test/r/select.result:
  SELECT ... INTO user_variables
mysql-test/t/select.test:
  SELECT ... INTO user_variables
sql/sql_class.cc:
  SELECT ... INTO user_variables
sql/sql_class.h:
  SELECT ... INTO user_variables
sql/sql_lex.h:
  SELECT ... INTO user_variables
sql/sql_parse.cc:
  SELECT ... INTO user_variables
sql/sql_yacc.yy:
  SELECT ... INTO user_variables

mysql-test/r/subselect.result:
  test for bug in subselect value storing
mysql-test/t/subselect.test:
  test for bug in subselect value storing

  aspects into *.c files from *.h files. Some steps to get closer to generating
*.c files from *.conf files again.

   from manual texi


Docs/manual.texi:
   - removed version numbers of GNU tools from the feature list
     (they are going to change from time to time again and the current
     required version number should probably be kept in one chapter only)

Docs/manual.texi:
  SCCS merged

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

 - currently, "make distcheck" fails - this needs to be investigated
   before the next release


Docs/manual.texi:
   - Updated toolchain version numbers
config.guess:
   - removed explicit setting of VENDOR=suse on SuSE systems