libmysqld/lib_sql.cc:
  Function renaming fix
libmysqld/sql_error.cc:
  Fix after pull
libmysqld/sql_prepare.cc:
  Fix after pull