restructured mysql-ms adaptor