into  magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt


sql/sql_update.cc:
  Auto merged