into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint

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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

 - Expose the already existing counter for number of stored procedure calls

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

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

  Run master init scripts also for --embedded-server

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

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

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

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

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

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt

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

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

into  damien-katzs-computer.local:/Users/dkatz/mysql50

into  damien-katzs-computer.local:/Users/dkatz/mysql51

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

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

            tmpdir has uppercase

Fix: don't convert mysql_tmpdir to lower case when building the path to a
temporary table

into  damien-katzs-computer.local:/Users/dkatz/50_frm_files

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

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

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

into  maint1.mysql.com:/data/localhome/tnurnberg/51-27293

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

  fix commit triggers with DD but not using DD

mysqldump didn't properly handle getting no data on
SHOW CREATE PROCEDURE.  If S/C/P fails (due to dumping
user's insufficient privileges on mysql.proc, say),
mysqldump will print a comment to that effect to the
output and return an error-code.  If the -f (force) option
is used, the dump will continue, otherwise, it will abort
right there and then.

Also fixes Bug#22761, "mysqldump reports no errors when using
--routines without mysql.proc privileges"
---
Merge mysql.com:/home/tnurnberg/27293/50-27293
into  mysql.com:/home/tnurnberg/27293/51-27293
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/tnurnberg/27293/51-27293

into  maint1.mysql.com:/data/localhome/tnurnberg/50-27293

+ some tests

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

mysqldump didn't properly handle getting no data on
SHOW CREATE PROCEDURE.  If S/C/P fails (due to dumping
user's insufficient privileges on mysql.proc, say),
mysqldump will print a comment to that effect to the
output and return an error-code.  If the -f (force) option
is used, the dump will continue, otherwise, it will abort
right there and then.

Also fixes Bug#22761, "mysqldump reports no errors when using
--routines without mysql.proc privileges"
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/27293/50-27293

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

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