Commit 143063 by dries

Commit #143063 by Dries at 20:10
Drupal: /includes/database/mysql/query.inc 1.3
- Patch #301501 by markus_petrux: optimize db_merge() in MySQL by taking advantage of ODKU syntax.