Changes in sql_parse.cc were not pushed.