← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Stewart Smith
  • Date: 2011-01-14 05:14:53 UTC
  • mto: (2086.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2087.
  • Revision ID: stewart@flamingspork.com-20110114051453-q8nkbvby6n12cpqw
add some FIXMEs to ORDER BY docs about what should be added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
103
103
bool extended_insert= true;
104
104
bool opt_replace_into= false;
105
105
bool opt_drop= true; 
106
 
bool opt_data_is_mangled= false;
107
106
uint32_t show_progress_size= 0;
108
107
static string insert_pat;
109
108
static uint32_t opt_drizzle_port= 0;
140
139
  opt_protocol,
141
140
  where;
142
141
 
 
142
//static const CHARSET_INFO *charset_info= &my_charset_utf8_general_ci;
 
143
 
143
144
boost::unordered_set<string> ignore_table;
144
145
 
145
146
void maybe_exit(int error);
546
547
  _("Password for destination db server (requires --destination-type=database)"))
547
548
  ("destination-database", po::value<string>(&opt_destination_database),
548
549
  _("The database in the destination db server (requires --destination-type=database, not for use with --all-databases)"))
549
 
  ("my-data-is-mangled", po::value<bool>(&opt_data_is_mangled)->default_value(false)->zero_tokens(),
550
 
  _("Do not make a UTF8 connection to MySQL, use if you have UTF8 data in a non-UTF8 table"))
551
550
  ;
552
551
 
553
552
  po::options_description client_options(_("Options specific to the client"));
768
767
    maybe_exit(EX_DRIZZLEERR);
769
768
  }
770
769
 
771
 
  if ((db_connection->getServerType() == DrizzleDumpConnection::SERVER_MYSQL_FOUND) and (not opt_data_is_mangled))
 
770
  if (db_connection->getServerType() == DrizzleDumpConnection::SERVER_MYSQL_FOUND)
772
771
    db_connection->queryNoResult("SET NAMES 'utf8'");
773
772
 
774
773
  if (vm.count("destination-type"))