Merge Monty - Fixed the last of the ICC warnings. Turned on warnings=errors Merge Brian - fixu bug #655558: SELECT 102/(1-1) should error on divide by zero Merge Brian - fix bug #654219: information_schema.key_column_usage does not contain information about FKs