Commit 7723eb02 authored by unknown's avatar unknown
Browse files

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/marko/k/mysql-4.0
parents f0ed73d8 c461eb86

sql/ha_myisam.cc

+16 −2
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ int ha_myisam::repair(THD* thd, HA_CHECK_OPT *check_opt) 


int ha_myisam::optimize(THD* thd, HA_CHECK_OPT *check_opt)

{

  int error;

  if (!file) return HA_ADMIN_INTERNAL_ERROR;

  MI_CHECK param;
@@ -534,7 +535,14 @@ int ha_myisam::optimize(THD* thd, HA_CHECK_OPT *check_opt) 
  param.testflag = (check_opt->flags | T_SILENT | T_FORCE_CREATE |

		    T_REP_BY_SORT | T_STATISTICS | T_SORT_INDEX);

  param.sort_buffer_length=  check_opt->sort_buffer_size;

  return repair(thd,param,1);

  if ((error= repair(thd,param,1)) && param.retry_repair)

  {

    sql_print_warning("Warning: Optimize table got errno %d, retrying",

                      my_errno);

    param.testflag&= ~T_REP_BY_SORT;

    error= repair(thd,param,1);

  }

  return error;

}
@@ -744,7 +752,13 @@ bool ha_myisam::activate_all_index(THD *thd) 
    param.myf_rw&= ~MY_WAIT_IF_FULL;

    param.sort_buffer_length=  thd->variables.myisam_sort_buff_size;

    param.tmpdir=mysql_tmpdir;

    error=repair(thd,param,0) != HA_ADMIN_OK;

    if ((error= (repair(thd,param,0) != HA_ADMIN_OK)) && param.retry_repair)

    {

      sql_print_warning("Warning: Enabling keys got errno %d, retrying",

                        my_errno);

      param.testflag&= ~(T_REP_BY_SORT | T_QUICK);

      error= (repair(thd,param,0) != HA_ADMIN_OK);

    }

    info(HA_STATUS_CONST);

    thd->proc_info=save_proc_info;

  }

sql/sql_table.cc

+1 −1
Original line number Diff line number Diff line
@@ -1614,7 +1614,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, 
	VOID(pthread_mutex_lock(&LOCK_open));

	wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);

	VOID(pthread_mutex_unlock(&LOCK_open));

	error= table->file->activate_all_index(thd);

	error= (table->file->activate_all_index(thd) ? -1 : 0);

	/* COND_refresh will be signaled in close_thread_tables() */

	break;

      case DISABLE: