Docs/manual.texi:
  - merge changes
configure.in:
  - merge changes
sql/share/charsets/Index:
  - merge changes
sql/share/charsets/win1251.conf:
  - merge changes