Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 297aec9ab163ea046451e1df3bccb9c920a5c80b https://github.com/phpmyadmin/phpmyadmin/commit/297aec9ab163ea046451e1df3bcc... Author: Fenn-CS fenn25.fn@gmail.com Date: 2017-03-21 (Tue, 21 Mar 2017)

Changed paths: M ChangeLog M import.php

Log Message: ----------- Added definitions for result and message variable-update methods still missing

Fixes #12349

Signed-off-by: Fenn-CS fenn25.fn@gmail.com Signed-off-by: Michal Čihař michal@cihar.com

Commit: aefe197e579b8ce8aaee796d25b19a5c918f311b https://github.com/phpmyadmin/phpmyadmin/commit/aefe197e579b8ce8aaee796d25b1... Author: Michal Čihař michal@cihar.com Date: 2017-03-21 (Tue, 21 Mar 2017)

Changed paths: M ChangeLog M import.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7adff6b57c64...aefe197e579b