into serg.mylan:/usr/home/serg/Abk/mysql-5.0

mysql-test/r/innodb.result:
  after merge fix

Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.


client/mysqlbinlog.cc:
  tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
mysql-test/r/ctype_ucs_binlog.result:
  update
mysql-test/r/mysqlbinlog.result:
  update
mysql-test/r/mysqlbinlog2.result:
  update
mysql-test/r/rpl_charset.result:
  update
mysql-test/r/rpl_timezone.result:
  update
mysql-test/r/user_var-binlog.result:
  update

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/mysqldump.result:
  Auto merged

into  mysql.com:/usr/home/ram/work/mysql-5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

ndb/include/mgmapi/ndb_logevent.h:
  more post-merge fixes
ndb/src/mgmapi/ndb_logevent.cpp:
  more post-merge fixes

into mysql.com:/home/psergey/mysql-5.0-bug13455

into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5

into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5

into mysql.com:/home/psergey/mysql-5.0-bug13455


mysql-test/r/innodb.result:
  Auto merged

"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".


mysql-test/r/heap.result:
  BUG#13455: updated test results
mysql-test/r/innodb.result:
  BUG#13455: updated test results
mysql-test/r/myisam.result:
  BUG#13455: updated test results
mysql-test/r/range.result:
  Testcase for BUG#13455
mysql-test/t/range.test:
  Testcase for BUG#13455

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0

everything except NDB


BUILD/SETUP.sh:
  Added base_max_no_ndb_configs so I can get a max-type build sans NDB for faster builds.
BUILD/compile-pentium-debug-max-no-ndb:
  new script to compile a max-type build sans NDB
BUILD/compile-ppc-debug-max-no-ndb:
  new script to build a max-type build sans NDB

  Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets


Makefile.am:
  Added test-pl and test-force-pl targets
server-tools/instance-manager/portability.h:
  Corrected OpenServer ifdef test

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

sql/sql_base.cc:
  fix for bug #13545: Server crash caused by select query.
  - compare table qualifier only with tables which are not nested joins.
  - perform recursion accordingly.
  - DBUG_ASSERT(table_list->table); added before the find_field_in_table() call.

into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0

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

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

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


mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/sql_show.cc:
  Auto merged

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

support-files/mysql.spec.sh:
  Auto merged

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


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged

support-files/mysql.spec.sh:
  Auto merged

   spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)


support-files/mysql.spec.sh:
   - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
     $RBR variable did not get expanded, thus leaving old build roots behind)

into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/t/merge.test:
  Auto merged
mysql-test/r/merge.result:
  SCCS merged

Second platform fix for floating point rounding.

mysql-test/t/sql_mode.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  Manual merge

into  hundin.mysql.fi:/home/jan/mysql-5.0

  "CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.


mysql-test/r/sql_mode.result:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case
mysql-test/t/sql_mode.test:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case

i.e. range test.

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

into  127.(none):/home/osku/mysql/5.0/revcpy

- call explicitly destructor for view's LEX
- cs fixes

into  hundin.mysql.fi:/home/jan/mysql-5.0


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Content merge.

innobase/include/ut0mem.h:
  Add ut_strlcpy_rev.
innobase/mem/mem0mem.c:
  Use ut_strlcpy_rev instead of buggy own implementation.
innobase/ut/ut0mem.c:
  Add ut_strlcpy_rev.