into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint

Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint

  merging

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51

into  trift2.:/MySQL/M51/test-help-5.1

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51

into  trift2.:/MySQL/M51/test-help-5.1

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50

into  trift2.:/MySQL/M50/test-help-5.0

Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.

into  trift2.:/MySQL/M50/test-help-5.0

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint

- Problem: data separators were copied to a fixed-size buffer
  on the stack; memcpy was used, without bounds checking; a
  server crash could result if long FIELDS ENCLOSED BY, etc.,
  was given
- Fix: write the separators directly, instead of copying to
  a buffer first (in select_export::send_data())

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

  Corrected GPL to be version 2 only

into  trift2.:/MySQL/M51/push-5.1

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

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

+ some fixes to do the enable

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

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

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

    Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH

  Fix correct min-value for LockPagesInMemory

into  recycle.(none):/src/bug25765/my51-bug25765

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  polly.local:/tmp/maint/mysql-5.1-maint

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build