bug #4313 GIS Visualization Extension does not work with PointFromText() function

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

Conflicts:
	ChangeLog
Merge branch 'QA_4_2'