Merge shakedown.(none):/home/jpipes/dev/bug20246/my51-bug20246

into  shakedown.(none):/home/jpipes/dev/mysql-5.1-maint


include/mysql.h:
  Auto merged