- Manual merge patch.


sql/sql_yacc.yy:
  Corrected merge error. ALTER VIEW rules has been split in two and both
  rules need to be checked for SP-context.