← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

Much closer toward UTF8 being around all the time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
125
125
static const char *drizzle_universal_client_charset=
126
126
  DRIZZLE_UNIVERSAL_CLIENT_CHARSET;
127
127
static char *default_charset;
128
 
static const CHARSET_INFO *charset_info= &my_charset_latin1;
 
128
static const CHARSET_INFO *charset_info= &my_charset_utf8_general_ci;
129
129
const char *default_dbug_option="d:t:o,/tmp/drizzledump.trace";
130
130
/* have we seen any VIEWs during table scanning? */
131
131
bool seen_views= 0;
2052
2052
     discarding SHOW CREATE EVENT statements generation. The myslq.event
2053
2053
     table data should be skipped too.
2054
2054
  */
2055
 
  if (!opt_events && !my_strcasecmp(&my_charset_latin1, db, "mysql") &&
2056
 
      !my_strcasecmp(&my_charset_latin1, table, "event"))
 
2055
  if (!opt_events && !my_strcasecmp(&my_charset_utf8_general_ci, db, "mysql") &&
 
2056
      !my_strcasecmp(&my_charset_utf8_general_ci, table, "event"))
2057
2057
  {
2058
2058
    verbose_msg("-- Skipping data table mysql.event, --skip-events was used\n");
2059
2059
    return;
2572
2572
static int init_dumping(char *database, int init_func(char*))
2573
2573
{
2574
2574
  if (drizzle_get_server_version(drizzle) >= 50003 &&
2575
 
      !my_strcasecmp(&my_charset_latin1, database, "information_schema"))
 
2575
      !my_strcasecmp(&my_charset_utf8_general_ci, database, "information_schema"))
2576
2576
    return 1;
2577
2577
 
2578
2578
  if (drizzle_select_db(drizzle, database))
2623
2623
  char table_buff[NAME_LEN*2+3];
2624
2624
  char hash_key[2*NAME_LEN+2];  /* "db.tablename" */
2625
2625
  char *afterdot;
2626
 
  int using_mysql_db= my_strcasecmp(&my_charset_latin1, database, "mysql");
 
2626
  int using_mysql_db= my_strcasecmp(&my_charset_utf8_general_ci, database, "mysql");
2627
2627
 
2628
2628
 
2629
2629
  afterdot= stpcpy(hash_key, database);
3218
3218
      If these two types, we do want to skip dumping the table
3219
3219
    */
3220
3220
    if (!opt_no_data &&
3221
 
        (!my_strcasecmp(&my_charset_latin1, table_type, "MRG_MyISAM") ||
 
3221
        (!my_strcasecmp(&my_charset_utf8_general_ci, table_type, "MRG_MyISAM") ||
3222
3222
         !strcmp(table_type,"MRG_ISAM")))
3223
3223
      result= IGNORE_DATA;
3224
3224
  }