← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Brian Aker
  • Date: 2010-12-07 09:12:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1985.
  • Revision ID: brian@tangent.org-20101207091212-1m0w20tck6z7632m
This is a fix for bug lp:686197

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
801
801
    dump_selected_tables(database_used, vm["Table-used"].as< vector<string> >());
802
802
  }
803
803
 
804
 
  if (vm.count("Table-used") and opt_databases)
 
804
  if (vm.count("Table-used") && opt_databases)
805
805
  {
 
806
/*
 
807
 * This is not valid!
806
808
    vector<string> database_used= vm["database-used"].as< vector<string> >();
807
809
    vector<string> table_used= vm["Table-used"].as< vector<string> >();
808
810
 
812
814
    {
813
815
      database_used.insert(database_used.end(), *it);
814
816
    }
815
 
 
816
817
    dump_databases(database_used);
817
 
    dump_all_tables();
 
818
    dump_tables();
 
819
*/
818
820
  }
819
 
 
 
821
  
820
822
  if (vm.count("database-used") && ! vm.count("Table-used"))
821
823
  {
822
824
    dump_databases(vm["database-used"].as< vector<string> >());
823
825
    dump_all_tables();
824
826
  }
825
 
 
826
827
  if (opt_destination == DESTINATION_STDOUT)
827
828
    generate_dump();
828
829
  else