Merge abarkov@bk-internal:/home/bk/mysql-5.0
unknown authored
into  mysql.com:/usr/home/bar/mysql-5.0.char1


sql/sql_yacc.yy:
  Auto merged
cd6d972b