~drizzle-trunk/drizzle/development

    if (!(session->open_temporary_table(path, db, table_name, 1, OTM_OPEN)))

      (void) session->rm_temporary_table(create_info->db_type, path);

      session->openTablesLock(table);

        if ((table->table= session->openTableLock(table, lock_type)) &&

  if (session->open_tables_from_list(&src_table, &not_used))

    if (err || !session->open_temporary_table(dst_path, db, table_name, 1, OTM_OPEN))

      (void) session->rm_temporary_table(create_info->db_type, dst_path);

  if (!(table= session->openTableLock(table_list, TL_WRITE)))

bool mysql_alter_table(Session *session, 

                       char *new_db, 

                       char *new_name,

                       uint32_t order_num, 

                       order_st *order, 

                       bool ignore)

  Table *table;

  Table *new_table= NULL;

  Table *name_lock= NULL;

  char tmp_name[80];

  char old_name[32];

  char new_name_buff[FN_REFLEN];

  char new_alias_buff[FN_REFLEN];

  char *table_name;

  char *db;

  ha_rows copied= 0;

  ha_rows deleted= 0;

  StorageEngine *old_db_type;

  StorageEngine *new_db_type;

  StorageEngine *save_old_db_type;

  session->set_proc_info("init");

 

  db= table_list->db;

  if (! new_db || ! my_strcasecmp(table_alias_charset, new_db, db))

 

  if (alter_info->tablespace_op != NO_TABLESPACE_OP)

  {

    /* DISCARD/IMPORT TABLESPACE is always alone in an ALTER Table */

    return mysql_discard_or_import_tablespace(session, table_list, alter_info->tablespace_op);

  }

 

 

    ... RENAME tries to use openTableLock, which does not work for views

    (openTableLock was never modified to merge table lists of child tables

  if (!(table= session->openTableLock(table_list, TL_WRITE_ALLOW_READ)))

  

    new_alias= new_name; // Create lower case table name

        ! my_strcasecmp(table_alias_charset, new_name_buff, table_name))

        Source and destination table names are equal: make later check

        easier.

        if (session->find_temporary_table(new_db, new_name_buff))

        {

          my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_name_buff);

          return true;

        }

        if (! name_lock)

          my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias);

          return true;

        build_table_filename(new_name_buff, sizeof(new_name_buff), new_db, new_name_buff, false);

 

        {

          /* Table will be closed by Session::executeCommand() */

          my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias);

          goto err;

        }

  if (! create_info->db_type)

  if (table->s->tmp_table != NO_TMP_TABLE)

 

  

    switch (alter_info->keys_onoff)

    {

 

    if (error == 0 && 

        (new_name != table_name || new_db != db))

        *fn_ext(new_name)= 0;

    if (error == 0)

    }

    {

 

 

    table_list->table= NULL;

    return error;

  /*

    goto err;

  snprintf(tmp_name, sizeof(tmp_name), "%s-%lx_%"PRIx64, TMP_FILE_PREFIX, (unsigned long) current_pid, session->thread_id);

  

  error= create_temporary_table(session, table, new_db, tmp_name, create_info, alter_info, ! strcmp(db, new_db));

 

  if (error != 0)

    new_table= session->openTable(&tbl, (bool*) 0, DRIZZLE_LOCK_IGNORE_FLUSH);

    new_table= session->open_temporary_table(tmp_path, new_db, tmp_name, 0, OTM_OPEN);

  session->cuted_fields= 0L;

  new_table->next_number_field= new_table->found_next_number_field;

  error= copy_data_between_tables(table, 

                                  new_table,

                                  alter_info->create_list, 

                                  ignore,

                                  order_num, 

                                  order, 

                                  &copied, 

                                  &deleted,

  /* We must not ignore bad input! */

 

      session->lock= 0;

 

 

    if (new_table->rename_temporary_table(new_db, new_name))

    

    new_table->intern_close_table();

 

  

 

  snprintf(old_name, sizeof(old_name), "%s2-%lx-%"PRIx64, TMP_FILE_PREFIX, (unsigned long) current_pid, session->thread_id);

 

  error= 0;

  if (mysql_rename_table(old_db_type, db, table_name, db, old_name, FN_TO_IS_TMP))

  {

  }

  else

  {

    if (mysql_rename_table(new_db_type, new_db, tmp_name, new_db, new_alias, FN_FROM_IS_TMP) != 0)

    {

      /* Try to get everything back. */

      error= 1;

      quick_rm_table(new_db_type, new_db, new_alias, false);

      quick_rm_table(new_db_type, new_db, tmp_name, true);

      mysql_rename_table(old_db_type, db, old_name, db, table_name, FN_FROM_IS_TMP);

    }

    t_table= session->open_temporary_table(table_path, new_db, tmp_name, false, OTM_OPEN);

      t_table->intern_close_table();

      errmsg_printf(ERRMSG_LVL_WARN, _("Could not open table %s.%s after rename\n"), new_db, table_name);

 

  table_list->table= NULL;

  return true;

  from->free_io_cache();

  from->free_io_cache();

    t= table->table= session->openTableLock(table, TL_READ);