Merge lp:~linuxjedi/libdrizzle/5.1-remove-tools into lp:libdrizzle

[Andrew Hutchings]

Remove drizzle_binlogs tool

It is now in the drizzle-tools project:
https://launchpad.net/drizzle-tools/

=== modified file 'Makefile.am'
--- Makefile.am	2013-01-08 12:12:01 +0000
+++ Makefile.am	2013-01-18 13:36:23 +0000
@@ -37,7 +37,6 @@
 include yatl/include.am
 include tests/include.am
 include m4/include.am
-include cli/include.am
 include libdrizzle/include.am
 include libdrizzle-5.1/include.am
 include rpm/include.am

=== removed directory 'cli'
=== removed file 'cli/drizzle_binlogs.c'
--- cli/drizzle_binlogs.c	2013-01-17 20:37:10 +0000
+++ cli/drizzle_binlogs.c	1970-01-01 00:00:00 +0000
@@ -1,350 +0,0 @@
-/*
- * Drizzle Client & Protocol Library
- *
- * Copyright (C) 2012 Drizzle Developer Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- *     * The names of its contributors may not be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "config.h"
-
-#include <libdrizzle-5.1/libdrizzle.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#ifdef HAVE_PWD_H
-# include <pwd.h>
-#endif
-
-#include <unistd.h>
-#include <errno.h>
-#include <time.h>
-
-#ifdef HAVE_ARGP_H
-# include <argp.h>
-#else
-# error "drizzle_binlogs requires <argp.h>"
-#endif
-
-#define STR_HELPER(x) #x
-#define STR(x) STR_HELPER(x)
-
-char *host= NULL;
-uint16_t port= DRIZZLE_DEFAULT_TCP_PORT;
-char *user= NULL;
-bool user_alloced= false;
-char *pass= NULL;
-char *outdir= NULL;
-char *start_file= NULL;
-uint32_t start_pos= 0;
-bool continuous= false;
-bool verify_checksums= false;
-uint8_t opt_count= 0;
-
-typedef enum
-{
-  OPT_NONE,
-  OPT_HOST,
-  OPT_PORT,
-  OPT_USER,
-  OPT_PASS,
-  OPT_OUTDIR,
-  OPT_FILE,
-  OPT_START_POS,
-  OPT_CONTINUOUS,
-  OPT_VERIFY_CHECKSUMS
-} option_consts_t;
-
-static struct argp_option options[]= {
-  { "host", OPT_HOST, "HOST", 0, "Hostname of server, default "DRIZZLE_DEFAULT_TCP_HOST, 0 },
-  { "port", OPT_PORT, "PORT", 0, "Port number of server, default "STR(DRIZZLE_DEFAULT_TCP_PORT), 0 },
-  { "user", OPT_USER, "USER", 0, "Username for the server, default is current system user", 0 },
-  { "pass", OPT_PASS, "PASS", 0, "Password for the server", 0 },
-  { "outdir", OPT_OUTDIR, "OUTDIR", 0, "Output directory", 0 },
-  { 0, 0, 0, 0, "Binlog Options", 1 },
-  { "start-file", OPT_FILE, "FILENAME", 0, "Binlog file to start with", 1 },
-  { "start-pos", OPT_START_POS, "POS", 0, "Position to start with", 1 },
-  { "continuous", OPT_CONTINUOUS, 0, 0, "Continous download mode", 1 },
-  { "verify-checksums", OPT_VERIFY_CHECKSUMS, 0, 0, "Verify binlog checkums", 1 },
-  { 0 }
-};
-
-static char doc[]= "Drizzle binlog retriever";
-static char args_doc[]= "";
-static error_t parse_opt(int key, char *arg, struct argp_state *state)
-{
-  (void)(state);
-  switch(key)
-  {
-    case OPT_HOST:
-      host= arg;
-      opt_count++;
-      break;
-    case OPT_PORT:
-      port= atoi(arg);
-      opt_count++;
-      break;
-    case OPT_USER:
-      user= arg;
-      opt_count++;
-      break;
-    case OPT_PASS:
-      pass= arg;
-      opt_count++;
-      break;
-    case OPT_OUTDIR:
-      outdir= arg;
-      opt_count++;
-      break;
-    case OPT_FILE:
-      start_file= arg;
-      opt_count++;
-      break;
-    case OPT_START_POS:
-      start_pos= atoi(arg);
-      opt_count++;
-      break;
-    case OPT_CONTINUOUS:
-      continuous= true;
-      opt_count++;
-      break;
-    case OPT_VERIFY_CHECKSUMS:
-      verify_checksums= true;
-      opt_count++;
-      break;
-    case ARGP_KEY_NO_ARGS:
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-      break;
-  }
-  return 0;
-}
-
-static struct argp argp = { options, parse_opt, args_doc, doc, NULL, NULL, NULL };
-
-bool get_system_user(char *dest, uint8_t len);
-drizzle_st *_connect(void);
-FILE *create_binlog_file(char *binlog_file);
-void get_binlogs(drizzle_st *con);
-void write_binlog(FILE* file, const unsigned char* data, uint32_t len);
-
-bool get_system_user(char *dest, uint8_t len)
-{
-  long pw_len= sysconf(_SC_GETPW_R_SIZE_MAX);
-  struct passwd pw_struct;
-  struct passwd *pw_tmp_struct;
-  if (pw_len == -1)
-  {
-    pw_len= 1024;
-  }
-  char *pw_buffer= malloc(pw_len);
-
-  if (getpwuid_r(geteuid(), &pw_struct, pw_buffer, pw_len, &pw_tmp_struct) == 0)
-  {
-    strncpy(dest, pw_struct.pw_name, len);
-    free(pw_buffer);
-    return true;
-  }
-  free(pw_buffer);
-  return false;
-}
-
-drizzle_st *_connect(void)
-{
-  drizzle_st *con;
-  drizzle_return_t ret;
-
-  con= drizzle_create_tcp(host, port, user, pass, "", 0);
-  if (!con)
-  {
-    printf("Drizzle connection object creation error\n");
-    return NULL;
-  }
-  ret= drizzle_connect(con);
-  if (ret != DRIZZLE_RETURN_OK)
-  {
-    printf("Error connecting to server: %s\n", drizzle_error(con));
-    return NULL;
-  }
-  return con;
-}
-
-FILE *create_binlog_file(char *binlog_file)
-{
-  FILE *outfile;
-  char filename[PATH_MAX];
-  if (outdir)
-  {
-    snprintf(filename, PATH_MAX, "%s/%s", outdir, binlog_file);
-    outfile= fopen(filename, "w");
-  }
-  else
-  {
-    outfile= fopen(binlog_file, "w");
-  }
-
-  return outfile;
-}
-
-void get_binlogs(drizzle_st *con)
-{
-  drizzle_result_st *result;
-  drizzle_return_t ret;
-  uint16_t server_id;
-  FILE *outfile;
-  char binlog_file[PATH_MAX];
-  uint32_t event_len;
-  bool read_end= false;
-
-  if (continuous)
-  {
-    srand(time(NULL));
-    // Random server ID from range 32767 - 65535
-    server_id= rand() % 32768 + 32767;
-  }
-  else
-  {
-    server_id= 0;
-  }
-
-  result= drizzle_start_binlog(con, server_id, start_file, start_pos, verify_checksums, &ret);
-  if (ret != DRIZZLE_RETURN_OK)
-  {
-    printf("Drizzle binlog start failure: %s\n", drizzle_error(con));
-    exit(EXIT_FAILURE);
-  }
-
-  snprintf(binlog_file, PATH_MAX, "%s", start_file);
-  outfile= create_binlog_file(binlog_file);
-  if (!outfile)
-  {
-    printf("Could not create binlog file '%s', errno %d\n", binlog_file, errno);
-    exit(EXIT_FAILURE);
-  }
-
-  while(1)
-  {
-    write_binlog(outfile, (unsigned char *)DRIZZLE_BINLOG_MAGIC, 4);
-    while(1)
-    {
-      ret= drizzle_binlog_get_next_event(result);
-      event_len= drizzle_binlog_event_raw_length(result);
-      if (ret != DRIZZLE_RETURN_OK)
-      {
-          // EOF
-          if (ret != DRIZZLE_RETURN_EOF)
-          {
-            printf("Read error: %d - %s\n", ret, drizzle_error(con));
-          }
-          read_end= true;
-          break;
-      }
-      if (drizzle_binlog_event_type(result) == DRIZZLE_EVENT_TYPE_ROTATE)
-      {
-        fclose(outfile);
-        snprintf(binlog_file, PATH_MAX, "%.*s", drizzle_binlog_event_length(result), drizzle_binlog_event_data(result));
-        outfile= create_binlog_file(binlog_file);
-        if (!outfile)
-        {
-          printf("Could not create binlog file '%s', errno %d\n", binlog_file, errno);
-          exit(EXIT_FAILURE);
-        }
-        break;
-      }
-      write_binlog(outfile, drizzle_binlog_event_raw_data(result), event_len);
-    }
-    if (read_end)
-    {
-      break;
-    }
-  }
-
-  drizzle_result_free(result);
-}
-
-void write_binlog(FILE* file, const unsigned char* data, uint32_t len)
-{
-  if (len)
-  {
-    if (fwrite(data, 1, len, file) != len)
-    {
-      printf("Error: binlog: Error writing binary log: %s", strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-  }
-
-}
-
-int main(int argc, char *argv[])
-{
-  drizzle_st *con;
-  char sysuser[DRIZZLE_MAX_USER_SIZE];
-  // Use the define here because we want it fixed at compile time
-  argp_program_version= LIBDRIZZLE_VERSION_STRING;
-  argp_program_bug_address= drizzle_bugreport();
-  argp_parse(&argp, argc, argv, 0, 0, NULL);
-  if (opt_count == 0)
-  {
-    argp_help(&argp, stdout, ARGP_HELP_STD_USAGE, program_invocation_short_name);
-    return EXIT_FAILURE;
-  }
-  if (!user)
-  {
-    user= sysuser;
-    if (!get_system_user(user, DRIZZLE_MAX_USER_SIZE))
-    {
-      printf("No user specified and could not determine current user\n");
-      return EXIT_FAILURE;
-    }
-  }
-  if (!host)
-  {
-    host= (char*)DRIZZLE_DEFAULT_TCP_HOST;
-  }
-  if (!port)
-  {
-    port= DRIZZLE_DEFAULT_TCP_PORT;
-  }
-  if (!start_file)
-  {
-    printf("Binlog start file required\n");
-    return EXIT_FAILURE;
-  }
-  con = _connect();
-  if (!con)
-  {
-    return EXIT_FAILURE;
-  }
-  get_binlogs(con);
-  drizzle_quit(con);
-  return EXIT_SUCCESS;
-}

=== removed file 'cli/drizzle_binlogs_check.sh.in'
--- cli/drizzle_binlogs_check.sh.in	2013-01-08 12:12:01 +0000
+++ cli/drizzle_binlogs_check.sh.in	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Simple test for drizzle_binlog
-
-cli/drizzle_binlogs --help  &> /dev/null 

=== removed file 'cli/include.am'
--- cli/include.am	2013-01-08 12:12:01 +0000
+++ cli/include.am	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-if BUILD_WIN32
-else
-bin_PROGRAMS+= cli/drizzle_binlogs
-cli_drizzle_binlogs_SOURCES= cli/drizzle_binlogs.c
-cli_drizzle_binlogs_LDADD= libdrizzle/libdrizzle.la
-
-check_SCRIPTS+= cli/drizzle_binlogs_check.sh
-endif

=== modified file 'configure.ac'
--- configure.ac	2013-01-13 20:48:01 +0000
+++ configure.ac	2013-01-18 13:36:23 +0000
@@ -98,7 +98,6 @@
 AX_CREATE_GENERIC_CONFIG
 AX_AM_JOBSERVER([yes])
 
-AC_CONFIG_FILES([cli/drizzle_binlogs_check.sh],[chmod +x cli/drizzle_binlogs_check.sh])
 AC_CONFIG_FILES([Makefile
                  docs/conf.py
                  rpm/spec

=== removed directory 'docs/cli'
=== removed file 'docs/cli/drizzle_binlog.rst'
--- docs/cli/drizzle_binlog.rst	2012-12-19 13:05:44 +0000
+++ docs/cli/drizzle_binlog.rst	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-.. program:: drizzle_binlog
-
-Drizzle Binlog
-==============
-
-Introduction
-------------
-
-Drizzle binlog is an example tool which will connect to a MySQL server as a
-slave, retrieve the binary log data and store it as local copies of the binary
-log files.  It has a continuous mode which will continue to download new events
-as they are applied.
-
-Usage
------
-
-:program:`drizzle_binlog` :option:`--start-file=binlog_file <--start-file>` OPTIONS
-
-Options
--------
-
-Main Options
-^^^^^^^^^^^^
-
-.. option:: --host <hostname>
-
-   The hostname for the MySQL server (default 'localhost')
-
-.. option:: --port <port>
-
-   The port number for the MySQL server (default 3306)
-
-.. option:: --user <user>
-
-   The MySQL user to connect as (default is the system user drizzle_binlog is executed as)
-
-.. option:: --pass <pass>
-
-   The MySQL password to connect using
-
-.. option:: --outdir <outdir>
-
-   The output directory to store the binlogs
-
-Binlog Options
-^^^^^^^^^^^^^^
-
-.. option:: --start-file <file>
-
-   Which binlog file should be requested first
-
-.. option:: --start-pos <pos>
-
-   Position in the binlog file to start at
-
-.. option:: --continuous
-
-   Connect as a random slave ID of 32768-65535 so drizzle_binlogs isn't
-   disconnected at the end of the last log

=== removed file 'docs/cli/index.rst'
--- docs/cli/index.rst	2012-12-19 13:05:44 +0000
+++ docs/cli/index.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-Example Command Line Clients
-============================
-
-.. toctree::
-   :maxdepth: 2
-
-   drizzle_binlog

=== modified file 'docs/index.rst'
--- docs/index.rst	2012-12-19 13:05:44 +0000
+++ docs/index.rst	2013-01-18 13:36:23 +0000
@@ -8,5 +8,4 @@
    license
    compiling
    api/index
-   cli/index
    examples/index

=== modified file 'rpm/spec.in'
--- rpm/spec.in	2013-01-17 20:37:10 +0000
+++ rpm/spec.in	2013-01-18 13:36:23 +0000
@@ -54,7 +54,6 @@
 %{_libdir}/libdrizzle.la
 %{_libdir}/libdrizzle.so
 %{_libdir}/libdrizzle.so.*
-%{_bindir}/drizzle_binlogs
 %{_bindir}/libdrizzle-config
 
 %files devel