Fix merge errors. MB functions are not required to handle geometry type names

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