Post-merge fix.  New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.


mysql-test/r/ctype_ucs.result:
  Post-merge fix
mysql-test/r/ctype_utf8.result:
  Post-merge fix
mysql-test/t/ctype_utf8.test:
  Post-merge fix
mysql-test/t/view.test:
  Post-merge fix