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


mysql-test/t/status.test:
  Auto merged
mysql-test/r/status.result:
  merge 5.0->5.1 of the fix for bug 30377
sql/sql_lex.h:
  merge 5.0->5.1 of the fix for bug 30377
sql/sql_select.cc:
  merge 5.0->5.1 of the fix for bug 30377