← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/archive_reader.cc

  • Committer: Jay Pipes
  • Date: 2010-04-08 16:27:25 UTC
  • mfrom: (1405.6.10 replication-pairs)
  • mto: This revision was merged to the branch mainline in revision 1457.
  • Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/archive_reader.cc
28
28
#include <fcntl.h>
29
29
#include "drizzled/charset_info.h"
30
30
#include "drizzled/internal/m_string.h"
31
 
#include "drizzled/my_getopt.h"
 
31
#include "drizzled/option.h"
32
32
 
33
33
#define SHOW_VERSION "0.1"
34
34
 
35
35
using namespace drizzled;
36
36
 
37
 
int get_one_option(int optid, const struct my_option *opt, char *argument);
 
37
int get_one_option(int optid, const struct option *opt, char *argument);
38
38
 
39
39
static void get_options(int *argc,char * * *argv);
40
40
static void print_version(void);
258
258
  return 0;
259
259
}
260
260
 
261
 
int get_one_option(int optid, const struct my_option *opt, char *argument)
 
261
int get_one_option(int optid, const struct option *opt, char *argument)
262
262
{
263
263
  (void)opt;
264
264
  switch (optid) {
299
299
  return 0;
300
300
}
301
301
 
302
 
static struct my_option my_long_options[] =
 
302
static struct option my_long_options[] =
303
303
{
304
304
  {"backup", 'b',
305
305
   "Make a backup of an archive table.",