Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2 Merge Andrew - fix bug 650935: remove --compress from all clients Merge Andrew - fix bug 653471: Add -A to drizzle client Merge Travis - 621861 = To change C structs to C++ classes in Drizzle