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


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type
  Merge seems to replace the test results by a new version of itself.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type
  Merge seems to replace the test case by a new version of itself.
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type
  This is solved differently between 5.0 and 4.1.
  The differences are unexplainable.
  result->prepare2() is new to 5.0, but doesn't
  appear in the diffs. Weird.

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


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type
  Replaced TYPE= by ENGINE=
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type
  Replaced TYPE= by ENGINE=
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type
  Completely recoded the bugfix for 4.1.

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.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test results.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test case.
sql/sql_class.h:
  BUG#6034 - Error code 124:  Wrong medium type.
  Added a new method for deferred preparation actions.
sql/sql_insert.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  If the insert table is one of the select tables, a part 
  of the result table preparations like disabling indexes
  has to be done after the select phase.
  This is now done in the new method select_insert::prepare2().
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  The result table preparation is now split into prepare() and
  prepare2(). Disabling indexes and other preparation stuff
  is deferred until after the selection 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.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test results.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test case.
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  With OPTION_BUFFER_RESULT in the 'select_options',
  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.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test results.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test case.
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  With OPTION_BUFFER_RESULT in the 'select_options',
  defer the preparation of the insert table until the 
  result is to be used. Unfortunately, this happens
  at several places.

client/Makefile.am:
  Don't use relative paths.

into mysql.com:/home/dlenev/src/mysql-5.0-merges


client/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged

into mysql.com:/home/dlenev/src/mysql-5.0-merges

into mysql.com:/home/dlenev/src/mysql-4.1-merges

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

  after merge clean-up


mysql-test/r/ps_6bdb.result:
  after merge clean-up
mysql-test/r/ps_7ndb.result:
  after merge clean-up

into mysql.com:/home/dlenev/src/mysql-5.0-merges


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/field.h:
  Auto merged

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

The old syntax works as well. WL#2356.

mysql-test/r/metadata.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

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

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

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

compile warning: changed eq_range -> eq_r

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

prefix", which roots were fixed in 4.0 tree.


mysql-test/r/alter_table.result:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".
mysql-test/t/alter_table.test:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".

client/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths in makefiles.
regex/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths.
strings/Makefile.am:
  Remove dead rule.

TIMESTAMP prefix" into 4.1 tree.


sql/field.h:
  Manual merge.

into mysql.com:/home/dlenev/src/mysql-4.0-bg7884

macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".


sql/field.h:
  Since FIELDFLAG_INTERVAL, FIELDFLAG_BITFIELD, FIELDFLAG_BLOB and
  FIELDFLAG_GEOM flags occupy the same space as number of decimals for
  FIELDFLAG_NUMBER fields, it is safer to check in "f_is_geom()"-type
  macros that we have non-number field, like we already do in f_is_blob()
  macro.

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

into mysql.com:/home/mysql_src/mysql-5.0-clean

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

  5.0 has a different way of knowing if master is < 3.23.57


sql/slave.cc:
  5.0 has a different way of knowing if master is < 3.23.57

into mysql.com:/home/kostja/work/mysql-5.0-root


configure.in:
  Auto merged

into mysql.com:/home/mysql_src/mysql-5.0-clean

not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.


mysql-test/r/analyse.result:
  SELECT PROCEDURE ANALIZE now returns
  BINARY columns, which is much better than it worked
  previously: CHAR with the default character set.
  But in the future it's worth to fix the fields
  'Field_name' and 'Optimal_fieldtype' to use UTF8,
  and 'Min_value' and 'Max_value' to inherit their charsets
  from the original items. But it is not important,
  and BINARY(N) is OK for now.
mysql-test/r/case.result:
  Test fix according to the changes
mysql-test/r/metadata.result:
  Test fix according to the changes
mysql-test/r/ps_1general.result:
  Test fix according to the changes
mysql-test/r/ps_2myisam.result:
  Test fix according to the changes
mysql-test/r/ps_3innodb.result:
  Test fix according to the changes
mysql-test/r/ps_4heap.result:
  Test fix according to the changes
mysql-test/r/ps_5merge.result:
  Test fix according to the changes
mysql-test/r/ps_6bdb.result:
  Test fix according to the changes
mysql-test/r/ps_7ndb.result:
  Test fix according to the changes
mysql-test/r/union.result:
  Test fix according to the changes
sql/item.cc:
  Item is now BINARY by default
sql/item_cmpfunc.cc:
  IFNULL now collects arguments collations/charsets
  like other functions do.

into mysql.com:/home/mysql_src/mysql-4.1-clean