← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

merge Andrew's fix for bug #313410
Files created with drizzledump can now be imported into drizzle without error!

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
1052
1052
  buffer->append(STRING_WITH_LEN("CREATE DATABASE "));
1053
1053
 
1054
1054
  if (create_options & HA_LEX_CREATE_IF_NOT_EXISTS)
1055
 
    buffer->append(STRING_WITH_LEN("/*!32312 IF NOT EXISTS*/ "));
 
1055
    buffer->append(STRING_WITH_LEN("IF NOT EXISTS "));
1056
1056
 
1057
1057
  append_identifier(session, buffer, dbname, strlen(dbname));
1058
1058
 
1059
 
  if (create.default_table_charset)
1060
 
  {
1061
 
    buffer->append(STRING_WITH_LEN(" /*!40100"));
1062
 
    buffer->append(STRING_WITH_LEN(" DEFAULT CHARACTER SET "));
1063
 
    buffer->append(create.default_table_charset->csname);
1064
 
    if (!(create.default_table_charset->state & MY_CS_PRIMARY))
1065
 
    {
1066
 
      buffer->append(STRING_WITH_LEN(" COLLATE "));
1067
 
      buffer->append(create.default_table_charset->name);
1068
 
    }
1069
 
    buffer->append(STRING_WITH_LEN(" */"));
1070
 
  }
1071
 
 
1072
1059
  return(false);
1073
1060
}
1074
1061