Merge Travis - 621861 - convert structs to classes Merge Billy - 621331 - Replace use of stringstream with boost::lexical_cast Merge Travis - 621861 = To change C structs to C++ classes in Drizzle Merge Andrew - fix bug 653300 - Syntax error on inport of a SQL file produced by drizzledump