← 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-28 00:15:58 UTC
  • mfrom: (1039.1.7 merge)
  • Revision ID: brian@gaz-20090528001558-xychs3xtpg8wz5i8
MErge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
823
823
      new_list= table->next_local[0];
824
824
    }
825
825
 
826
 
    if (! session->endActiveTransaction() || drizzle_rename_tables(session, first_table, 0))
 
826
    if (! session->endActiveTransaction() || drizzle_rename_tables(session, first_table))
827
827
    {
828
828
      goto error;
829
829
    }
1251
1251
      my_error(ER_WRONG_DB_NAME, MYF(0), lex->name.str);
1252
1252
      break;
1253
1253
    }
1254
 
    res= mysql_create_db(session,(lower_case_table_names == 2 ? alias :
1255
 
                              lex->name.str), &create_info, 0);
 
1254
    res= mysql_create_db(session,(lex->name.str), &create_info);
1256
1255
    break;
1257
1256
  }
1258
1257
  case SQLCOM_DROP_DB:
1272
1271
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
1273
1272
      goto error;
1274
1273
    }
1275
 
    res= mysql_rm_db(session, lex->name.str, lex->drop_if_exists, 0);
 
1274
    res= mysql_rm_db(session, lex->name.str, lex->drop_if_exists);
1276
1275
    break;
1277
1276
  }
1278
1277
  case SQLCOM_ALTER_DB:
1981
1980
 
1982
1981
  ptr->alias= alias_str;
1983
1982
  ptr->is_alias= alias ? true : false;
1984
 
  if (lower_case_table_names && table->table.length)
 
1983
  if (table->table.length)
1985
1984
    table->table.length= my_casedn_str(files_charset_info, table->table.str);
1986
1985
  ptr->table_name=table->table.str;
1987
1986
  ptr->table_name_length=table->table.length;