into mysql.com:/home/mydev/mysql-5.0-5000

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

  corrected bug when looking at dist keys in create table

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

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

Merged a different solution from 4.1 to 5.0.
Unexplainable diffs.

    added testcase for Bug#8035
    added option to wait for not-started
    Bug#8035

into mysql.com:/usr/home/bar/mysql-5.0

Completely recoded the bugfix for 4.1.
This is just a merge changeset.

  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.

  Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks to Serg for help with a perl program 
  to merge 4.1 messages into 5.0 format :)

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

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

  release connections when last op was simple read

  environment (using "build" on SUSE Linux)

into mysql.com:/usr/home/bar/mysql-5.0

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

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

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

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

into mysql.com:/usr/home/bar/mysql-5.0

  Minor fix after character set conversion.

into mysql.com:/home/psergey/mysql-5.0-fix-vg1

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

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

  Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt

into mysql.com:/usr/home/bar/mysql-5.0

  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.

  new file

Version for 5.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.

Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.

Version for 4.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.

into mysql.com:/dbdata/psergey/mysql-5.0-bug7885

into mysql.com:/dbdata/psergey/mysql-4.1-bug7885

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

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