mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/table.cc:
  Merge warning of multi-byte charset being applied
  to table of unknown charset.

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

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

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

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

mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's

mysql-test/r/type_float.result:
  Update test results (4.1 produces a warning that 4.0 did not,
  and they were merged into the wrong position).

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

sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge

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

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