Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


sql/sql_parse.cc:
  Auto merged
76921c97