← Back to branch summary

~patrick-crews/drizzle/bug771606_dbqp_repeat

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Lee Bieber
  • Date: 2011-04-13 23:47:18 UTC
  • mfrom: (2276.1.2 build)
  • Revision ID: kalebral@gmail.com-20110413234718-uc6emsr6ms1szt4c
Merge Olaf - Refactor Program Options usage
Merge Andrew - 748064: Xtrabackup breaks trunk in GCC 4.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
639
639
 
640
640
  /* Inverted Booleans */
641
641
 
642
 
  opt_drop= (vm.count("skip-drop-table")) ? false : true;
643
 
  opt_comments= (vm.count("skip-comments")) ? false : true;
644
 
  extended_insert= (vm.count("skip-extended-insert")) ? false : true;
645
 
  opt_dump_date= (vm.count("skip-dump-date")) ? false : true;
646
 
  opt_disable_keys= (vm.count("skip-disable-keys")) ? false : true;
647
 
  opt_quoted= (vm.count("skip-quote-names")) ? false : true;
 
642
  opt_drop= not vm.count("skip-drop-table");
 
643
  opt_comments= not vm.count("skip-comments");
 
644
  extended_insert= not vm.count("skip-extended-insert");
 
645
  opt_dump_date= not vm.count("skip-dump-date");
 
646
  opt_disable_keys= not vm.count("skip-disable-keys");
 
647
  opt_quoted= not vm.count("skip-quote-names");
648
648
 
649
649
  if (vm.count("protocol"))
650
650
  {
675
675
    }
676
676
  }
677
677
 
678
 
  if(vm.count("password"))
 
678
  if (vm.count("password"))
679
679
  {
680
680
    if (!opt_password.empty())
681
681
      opt_password.erase();
786
786
    dump_all_databases();
787
787
    dump_all_tables();
788
788
  }
789
 
  if (vm.count("database-used") && vm.count("Table-used") && ! opt_databases)
 
789
  if (vm.count("database-used") && vm.count("Table-used") && not opt_databases)
790
790
  {
791
791
    string database_used= *vm["database-used"].as< vector<string> >().begin();
792
792
    /* Only one database and selected table(s) */
793
793
    dump_selected_tables(database_used, vm["Table-used"].as< vector<string> >());
794
794
  }
795
795
 
796
 
  if (vm.count("Table-used") and opt_databases)
 
796
  if (vm.count("Table-used") && opt_databases)
797
797
  {
798
798
    vector<string> database_used= vm["database-used"].as< vector<string> >();
799
799
    vector<string> table_used= vm["Table-used"].as< vector<string> >();
809
809
    dump_all_tables();
810
810
  }
811
811
 
812
 
  if (vm.count("database-used") && ! vm.count("Table-used"))
 
812
  if (vm.count("database-used") && not vm.count("Table-used"))
813
813
  {
814
814
    dump_databases(vm["database-used"].as< vector<string> >());
815
815
    dump_all_tables();