- Added testcases to test delimiters in 5.0
 - In 5.0 it's allowed to have a up to 16 byte string as delimiter, everything after the delimiter token will be treated as the delimiter. It's even allowed to set delimiter to 'delimiter', ':;' or'MySQL'

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita

into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0


sql/sql_show.cc:
  Auto merged

  additional fix after review

comment change (post-review of "replication of triggers"). Btw date_formats segfaults with --ps-protocol - not caused by my changes though; I'll file a bug report.


sql/sql_trigger.h:
  changing comment

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita

into ibmlab.site:/home/my/bk/mysql-5.0

BitKeeper/etc/logging_ok:
  auto-union
include/my_global.h:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  SCCS merged

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/range.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

sql/item_strfunc.h:
  Remove the testcode

another column gets rotten value.


mysql-test/r/type_newdecimal.result:
  Added a test case for Bug#10232: update with subquery, precision math,
  another column gets rotten value.
mysql-test/t/type_newdecimal.test:
  Added a test case for Bug#10232: update with subquery, precision math,
  another column gets rotten value.

into mysql.com:/home/psergey/mysql-4.1-bug10095


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

into mysql.com:/home/hf/work/mysql-5.0.clean


BitKeeper/etc/logging_ok:
  auto-union
strings/ctype-sjis.c:
  Auto merged

into mysql.com:/home/hf/work/mysql-4.1.ssj

strings/ctype-sjis.c:
  pos should be decreased
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

BUILD/check-cpu:
  Pentium M

include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
  merge
ndb/test/run-test/Makefile.am:
  merge
sql/mysql_priv.h:
  merge from 4.1
sql/table.cc:
  Merge from 4.1

include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged

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

into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404

into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404

into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404

heap/hp_hash.c:
  Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries 
      use length in symbols instead of length in bytes
      to calculate record length and key length

  Bumped up version number to indicate 4.1.12 was branched off


configure.in:
  Bumped up version number to indicate 4.1.12 was branched off

with multi-byte strings, length() instead
of numchars() where used in a mistake.

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

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

into mysql.com:/home/ram/work/mysql-4.1

into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733


sql/sql_yacc.yy:
  Auto merged

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

include/my_global.h:
  a fix (bug #10438: Raid stopped working because of change in atomic add detection).
  In order to compile with atomic.h on itanium we redefine 'new' because it's used
  as a local variable in this file and conflicts with a kernel header.

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

  Detect conflicting options in SELECT


mysql-test/r/select.result:
  Test for bug#8733
mysql-test/t/select.test:
  Test for bug#8733
sql/mysql_priv.h:
  New bit for ALL
sql/sql_yacc.yy:
  We want to complain if DISTINCT or ALL is used in SELECT when a
  conflicting option is already selected.

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