Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6f9367b1652e6b5cee652ab4729bb0253ac74b95 https://github.com/phpmyadmin/phpmyadmin/commit/6f9367b1652e6b5cee652ab4729b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-06 (Fri, 06 Feb 2015)

Changed paths: M ChangeLog M libraries/plugins/import/ImportCsv.class.php

Log Message: ----------- rfe #1192 ON DUPLICATE KEY UPDATE for loading CSV

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com