← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-05-14 16:47:01 UTC
  • mfrom: (1014.3.4 merge)
  • Revision ID: brian@gaz-20090514164701-l58qmp3mqo6et160
Merging Brian's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
745
745
    memset(&create_info, 0, sizeof(create_info));
746
746
    create_info.db_type= 0;
747
747
    create_info.row_type= ROW_TYPE_NOT_USED;
748
 
    create_info.default_table_charset= session->variables.collation_database;
 
748
    create_info.default_table_charset= get_default_db_collation(session->db);
749
749
 
750
750
    res= mysql_alter_table(session, first_table->db, first_table->table_name,
751
751
                           &create_info, first_table, &alter_info,
2000
2000
  if (!ptr->derived && !my_strcasecmp(system_charset_info, ptr->db,
2001
2001
                                      INFORMATION_SCHEMA_NAME.c_str()))
2002
2002
  {
2003
 
    InfoSchemaTable *schema_table= find_schema_table(session, ptr->table_name);
 
2003
    InfoSchemaTable *schema_table= find_schema_table(ptr->table_name);
2004
2004
    if (!schema_table ||
2005
2005
        (schema_table->hidden &&
2006
2006
         ((sql_command_flags[lex->sql_command].test(CF_BIT_STATUS_COMMAND)) == 0 ||