Clundquist updates

Updates for MySQL 5.5 and "key" reserved word