+ some fixes to do the enable

 - correction of patch, original patch will segfault for print option

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt

  After merge fix.

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql

  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  Fix compile error with gcc4

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

  Fix race in testprg...causing random TC crashes

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

 increase some timeouts...

include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1

s/ulonglong/key_part_map/, comments

  Post-merge fix.

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

UPDATE if the row wasn't actually changed.

This bug was caused by fix for bug#19978. It causes AFTER UPDATE triggers
not firing if a row wasn't actually changed by the update part of the
INSERT .. ON DUPLICATE KEY UPDATE.

Now triggers are always fired if a row is touched by the INSERT ... ON
DUPLICATE KEY UPDATE.

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  Allow readTablePk to stumble on scan+deleted tuple,
      reporting no-match instead of crash (in case scan is lock-owner)

into  magare.gmz:/home/kgeorge/mysql/autopush/B26261-5.0-opt

 INSERT uses query_id to verify what fields are
 mentioned in the fields list of the INSERT command.
 However the check for that is made after the 
 ON DUPLICATE KEY is processed. This causes all
 the fields mentioned in ON DUPLICATE KEY to be 
 considered as mentioned in the fields list of 
 INSERT.
 Moved the check up, right after processing the
 fields list.

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

The crash happens when 'skip-grant-tables' is enabled.
We skip the filling of I_S privilege tables 
if acl_cache is not initialized.

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt