2.1.18 MySQLi

Continuing change