Code

Allowing both Charset & Collation#808

Code

Closed

tgriesser wants to merge 4 commits intomysqljs:mastermysqljs/mysql:masterfrom

tgriesser:masterCopy head branch name to clipboard

Commits

Commits on May 6, 2014

• renamed charsets to collations

  tgriesser

  committed
  f2d6c04

  Copy full SHA for f2d6c04

• Allow both charset and collation as config options, #807

  tgriesser

  committed
  6aceb79

  Copy full SHA for 6aceb79

• Throw if invalid charset is specified for collation

  tgriesser

  committed
  67c1993

  Copy full SHA for 67c1993

• Revert collation -> charset in tests

  tgriesser

  committed
  bb34868

  Copy full SHA for bb34868