Merge lp:~linuxjedi/mydumper/mydumper-bp-gzip into lp:~mydumper/mydumper/trunk

[Andrew Hutchings]

Add protocol compression
Fixups, especially to CMake

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-04-26 19:14:47 +0000
+++ CMakeLists.txt	2011-04-27 19:54:26 +0000
@@ -12,7 +12,7 @@
 
 add_subdirectory(docs)
 
-set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Werror -Wshadow -O3 -g")
+set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Werror -Wshadow -O3 -g ${MYSQL_CFLAGS}")
 
 include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
 
@@ -24,7 +24,8 @@
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 add_executable(mydumper mydumper.c binlog.c)
-target_link_libraries(mydumper ${MYSQL_LIBRARY} ${MYSQL_EXTRA_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES})
+target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES})
+
 INSTALL(TARGETS mydumper
   RUNTIME DESTINATION bin
 )

=== modified file 'cmake/modules/FindMySQL.cmake'
--- cmake/modules/FindMySQL.cmake	2011-04-21 20:52:39 +0000
+++ cmake/modules/FindMySQL.cmake	2011-04-27 19:54:26 +0000
@@ -1,142 +1,107 @@
-#
-# Find the MySQL client includes and library
-# 
-
+# - Find MySQL
+# Find the MySQL includes and client library
 # This module defines
-# MYSQL_INCLUDE_DIR, where to find mysql.h
-# MYSQL_LIBRARIES, the libraries to link against to connect to MySQL
-# MYSQL_FOUND, if false, you cannot build anything that requires MySQL.
-
-# also defined, but not for general use are
-# MYSQL_LIBRARY, where to find the MySQL library.
-
-set( MYSQL_FOUND 0 )
-
-if( UNIX )
-  set(MYSQL_CONFIG_PREFER_PATH "$ENV{MYSQL_HOME}/bin" CACHE FILEPATH
-    "preferred path to MySQL (mysql_config)"
-  )
-
-  find_program(MYSQL_CONFIG mysql_config
-    ${MYSQL_CONFIG_PREFER_PATH}
-    /usr/local/mysql/bin/
-    /usr/local/bin/
-    /usr/bin/
-  )
-
-  if( MYSQL_CONFIG )
-    message(STATUS "Using mysql-config: ${MYSQL_CONFIG}")
-    # set INCLUDE_DIR
-    exec_program(${MYSQL_CONFIG}
-      ARGS --include
-      OUTPUT_VARIABLE MY_TMP
-    )
-
-    string(REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
-    set(MYSQL_ADD_INCLUDE_PATH ${MY_TMP} CACHE FILEPATH INTERNAL)
-    #message("[DEBUG] MYSQL ADD_INCLUDE_PATH : ${MYSQL_ADD_INCLUDE_PATH}")
-    # set LIBRARY_DIR
-    exec_program(${MYSQL_CONFIG}
-      ARGS --libs_r
-      OUTPUT_VARIABLE MY_TMP
-    )
-    set(MYSQL_ADD_LIBRARIES "")
-    string(REGEX MATCHALL "-l[^ ]*" MYSQL_LIB_LIST "${MY_TMP}")
-    foreach(LIB ${MYSQL_LIB_LIST})
-      string(REGEX REPLACE "[ ]*-l([^ ]*)" "\\1" LIB "${LIB}")
-      list(APPEND MYSQL_ADD_LIBRARIES "${LIB}")
-      #message("[DEBUG] MYSQL ADD_LIBRARIES : ${MYSQL_ADD_LIBRARIES}")
-    endforeach(LIB ${MYSQL_LIB_LIST})
-
-    set(MYSQL_ADD_LIBRARIES_PATH "")
-    string(REGEX MATCHALL "-L[^ ]*" MYSQL_LIBDIR_LIST "${MY_TMP}")
-    foreach(LIB ${MYSQL_LIBDIR_LIST})
-      string(REGEX REPLACE "[ ]*-L([^ ]*)" "\\1" LIB "${LIB}")
-      list(APPEND MYSQL_ADD_LIBRARIES_PATH "${LIB}")
-      #message("[DEBUG] MYSQL ADD_LIBRARIES_PATH : ${MYSQL_ADD_LIBRARIES_PATH}")
-    endforeach(LIB ${MYSQL_LIBS})
-
-  else( MYSQL_CONFIG )
-    set(MYSQL_ADD_LIBRARIES "")
-    list(APPEND MYSQL_ADD_LIBRARIES "mysqlclient_r")
-  endif( MYSQL_CONFIG )
-endif( UNIX )
-
-find_path(MYSQL_INCLUDE_DIR
-  NAMES
-    mysql.h
-  PATHS
-    ${MYSQL_ADD_INCLUDE_PATH}
-    /usr/include
-    /usr/include/mysql
+#  MYSQL_INCLUDE_DIR, where to find mysql.h
+#  MYSQL_LIBRARIES, the libraries needed to use MySQL.
+#  MYSQL_FOUND, If false, do not try to use MySQL.
+#
+# Copyright (c) 2006, Jaroslaw Staniek, <[e-mail]>
+# Lot of adustmens by Michal Cihar <[e-mail]>
+#
+# vim: expandtab sw=4 ts=4 sts=4:
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+if(UNIX) 
+    set(MYSQL_CONFIG_PREFER_PATH "$ENV{MYSQL_HOME}/bin" CACHE FILEPATH
+        "preferred path to MySQL (mysql_config)")
+    find_program(MYSQL_CONFIG mysql_config
+        ${MYSQL_CONFIG_PREFER_PATH}
+        /usr/local/mysql/bin/
+        /usr/local/bin/
+        /usr/bin/
+        )
+    
+    if(MYSQL_CONFIG) 
+        message(STATUS "Using mysql-config: ${MYSQL_CONFIG}")
+        # set CFLAGS
+        exec_program(${MYSQL_CONFIG}
+            ARGS --cflags
+            OUTPUT_VARIABLE MY_TMP)
+
+        set(MYSQL_CFLAGS ${MY_TMP} CACHE STRING INTERNAL)
+
+        # set INCLUDE_DIR
+        exec_program(${MYSQL_CONFIG}
+            ARGS --include
+            OUTPUT_VARIABLE MY_TMP)
+
+        string(REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
+
+        set(MYSQL_ADD_INCLUDE_DIR ${MY_TMP} CACHE FILEPATH INTERNAL)
+
+        # set LIBRARY_DIR
+        exec_program(${MYSQL_CONFIG}
+            ARGS --libs_r
+            OUTPUT_VARIABLE MY_TMP)
+
+        set(MYSQL_ADD_LIBRARIES "")
+
+        string(REGEX MATCHALL "-l[^ ]*" MYSQL_LIB_LIST "${MY_TMP}")
+        foreach(LIB ${MYSQL_LIB_LIST})
+            string(REGEX REPLACE "[ ]*-l([^ ]*)" "\\1" LIB "${LIB}")
+            list(APPEND MYSQL_ADD_LIBRARIES "${LIB}")
+        endforeach(LIB ${MYSQL_LIBS})
+
+        set(MYSQL_ADD_LIBRARY_PATH "")
+
+        string(REGEX MATCHALL "-L[^ ]*" MYSQL_LIBDIR_LIST "${MY_TMP}")
+        foreach(LIB ${MYSQL_LIBDIR_LIST})
+            string(REGEX REPLACE "[ ]*-L([^ ]*)" "\\1" LIB "${LIB}")
+            list(APPEND MYSQL_ADD_LIBRARY_PATH "${LIB}")
+        endforeach(LIB ${MYSQL_LIBS})
+
+    else(MYSQL_CONFIG)
+        set(MYSQL_ADD_LIBRARIES "")
+        list(APPEND MYSQL_ADD_LIBRARIES "mysqlclient")
+    endif(MYSQL_CONFIG)
+else(UNIX)
+    set(MYSQL_ADD_INCLUDE_DIR "c:/msys/local/include" CACHE FILEPATH INTERNAL)
+    set(MYSQL_ADD_LIBRARY_PATH "c:/msys/local/lib" CACHE FILEPATH INTERNAL)
+ENDIF(UNIX)
+
+find_path(MYSQL_INCLUDE_DIR mysql.h
     /usr/local/include
-    /usr/local/include/mysql
+    /usr/local/include/mysql 
     /usr/local/mysql/include
-    "C:/Program Files/MySQL/include"
-    "C:/Program Files/MySQL/MySQL Server 5.0/include"
-    "C:/Program Files/MySQL/MySQL Server 5.1/include"
-    "C:/MySQL/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include"
-    "c:/msys/local/include"
-  DOC
-    "Specify the directory containing mysql.h."
+    /usr/local/mysql/include/mysql
+    /usr/include 
+    /usr/include/mysql
+    ${MYSQL_ADD_INCLUDE_DIR}
 )
 
-if( UNIX )
+set(TMP_MYSQL_LIBRARIES "")
+
 foreach(LIB ${MYSQL_ADD_LIBRARIES})
-  find_library( MYSQL_LIBRARY 
-    NAMES
-      mysql libmysql ${LIB}
-    PATHS
-      ${MYSQL_ADD_LIBRARIES_PATH}
-      /usr/lib
-      /usr/lib/mysql
-      /usr/local/lib
-      /usr/local/lib/mysql
-      /usr/local/mysql/lib
-      "C:/Program Files/MySQL/lib"
-      "C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
-      "C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
-      "C:/MySQL/lib/debug"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
-      "c:/msys/local/include"
-    DOC "Specify the location of the mysql library here."
-  )
-endforeach(LIB ${MYSQL_ADD_LIBRARY})
-endif( UNIX )
-
-# On Windows you typically don't need to include any extra libraries
-# to build MYSQL stuff.
-
-if( NOT WIN32 )
-  find_library( MYSQL_EXTRA_LIBRARIES
-    NAMES
-      z zlib
-    PATHS
-      /usr/lib
-      /usr/local/lib
-    DOC
-      "if more libraries are necessary to link in a MySQL client (typically zlib), specify them here."
-  )
-else( NOT WIN32 )
-  set( MYSQL_EXTRA_LIBRARIES "" )
-endif( NOT WIN32 )
-
-if( MYSQL_LIBRARY )
-  if( MYSQL_INCLUDE_DIR )
-    set( MYSQL_FOUND 1 )
-    message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}")
-    message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}")
-  else( MYSQL_INCLUDE_DIR )
-      message(FATAL_ERROR "Could not find MySQL headers! Please install the development-libraries and headers.")
-  endif( MYSQL_INCLUDE_DIR )
-  mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR )
-else( MYSQL_LIBRARY )
-  message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development-libraries and headers.")
-endif( MYSQL_LIBRARY )
+    find_library("MYSQL_LIBRARIES_${LIB}" NAMES ${LIB}
+        PATHS
+        ${MYSQL_ADD_LIBRARY_PATH}
+        /usr/lib/mysql
+        /usr/local/lib
+        /usr/local/lib/mysql
+        /usr/local/mysql/lib
+    )
+    list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${LIB}}")
+endforeach(LIB ${MYSQL_ADD_LIBRARIES})
+
+set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
+
+if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+    set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
+    message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")
+else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+    set(MYSQL_FOUND FALSE CACHE INTERNAL "MySQL found")
+    message(STATUS "MySQL not found.")
+endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+
+mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES MYSQL_CFLAGS)

=== modified file 'docs/usage.rst'
--- docs/usage.rst	2011-04-26 17:46:33 +0000
+++ docs/usage.rst	2011-04-27 19:54:26 +0000
@@ -76,6 +76,10 @@
 
    Compress the output files
 
+.. option:: --compress-input, -C
+
+   Use client protocol compression for connections to the MySQL server
+
 .. option:: --build-empty-files, -e
 
    Create empty dump files if there is no data to dump

=== modified file 'mydumper.c'
--- mydumper.c	2011-04-27 06:39:15 +0000
+++ mydumper.c	2011-04-27 19:54:26 +0000
@@ -61,6 +61,7 @@
 
 int need_dummy_read=0;
 int compress_output=0;
+int compress_input=1;
 int killqueries=0;
 
 gchar *ignore_engines = NULL;
@@ -88,6 +89,7 @@
 	{ "statement-size", 's', 0, G_OPTION_ARG_INT, &statement_size, "Attempted size of INSERT statement in bytes", NULL},
 	{ "rows", 'r', 0, G_OPTION_ARG_INT, &rows_per_file, "Try to split tables into chunks of this many rows", NULL},
 	{ "compress", 'c', 0, G_OPTION_ARG_NONE, &compress_output, "Compress output files", NULL},
+	{ "compress-input", 'C', 0, G_OPTION_ARG_NONE, &compress_input, "Use compression on the MySQL connection", NULL },
 	{ "build-empty-files", 'e', 0, G_OPTION_ARG_NONE, &build_empty_files, "Build dump files even if no data available from table", NULL},
 	{ "regex", 'x', 0, G_OPTION_ARG_STRING, &regexstring, "Regular expression for 'db.table' matching", NULL},
 	{ "ignore-engines", 'i', 0, G_OPTION_ARG_STRING, &ignore_engines, "Comma delimited list of storage engines to ignore", NULL },
@@ -197,6 +199,9 @@
 
 	mysql_options(thrconn,MYSQL_READ_DEFAULT_GROUP,"mydumper");
 
+	if (compress_input)
+		mysql_options(thrconn,MYSQL_OPT_COMPRESS,NULL);
+
 	if (!mysql_real_connect(thrconn, hostname, username, password, NULL, port, socket_path, 0)) {
 		g_critical("Failed to connect to database: %s", mysql_error(thrconn));
 		exit(EXIT_FAILURE);
@@ -256,6 +261,8 @@
 					thrconn= mysql_init(NULL);
 					g_mutex_unlock(init_mutex);
 				}
+				if (compress_input)
+					mysql_options(thrconn,MYSQL_OPT_COMPRESS,NULL);
 
 				if (!mysql_real_connect(thrconn, hostname, username, password, NULL, port, socket_path, 0)) {
 					g_critical("Failed to connect to database: %s", mysql_error(thrconn));