Merge lp:~linuxjedi/mydumper/trunk-drizzle-support2 into lp:~mydumper/mydumper/trunk

[Andrew Hutchings]

Fix Drizzle support which was broken by consistent snapshot support

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-05-18 12:46:30 +0000
+++ CMakeLists.txt	2011-05-23 09:21:12 +0000
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 project(mydumper)
-set(VERSION 0.2.1)
+set(VERSION 0.2.2)
 set(ARCHIVE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
 
 #Required packages

=== modified file 'mydumper.c'
--- mydumper.c	2011-05-19 18:50:38 +0000
+++ mydumper.c	2011-05-23 09:21:12 +0000
@@ -812,7 +812,10 @@
 
 	char *query;
 	mysql_select_db(conn,database);
-	query= g_strdup("SHOW TABLE STATUS");
+	if (detected_server == SERVER_TYPE_MYSQL)
+		query= g_strdup("SHOW TABLE STATUS");
+	else
+		query= g_strdup_printf("SELECT TABLE_NAME, ENGINE, TABLE_TYPE as COMMENT FROM DATA_DICTIONARY.TABLES WHERE TABLE_SCHEMA='%s'", database);
 
 	if (mysql_query(conn, (query))) {
 		g_critical("Error: DB: %s - Could not execute query: %s", database, mysql_error(conn));