mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked) This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
This commit is contained in:
@@ -872,8 +872,9 @@ static int send_check_errmsg(THD* thd, TABLE_LIST* table,
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static int prepare_for_restore(THD* thd, TABLE_LIST* table,
|
||||
HA_CHECK_OPT *check_opt)
|
||||
HA_CHECK_OPT *check_opt)
|
||||
{
|
||||
DBUG_ENTER("prepare_for_restore");
|
||||
|
||||
@@ -915,15 +916,18 @@ static int prepare_for_restore(THD* thd, TABLE_LIST* table,
|
||||
}
|
||||
}
|
||||
|
||||
// now we should be able to open the partially restored table
|
||||
// to finish the restore in the handler later on
|
||||
/*
|
||||
Now we should be able to open the partially restored table
|
||||
to finish the restore in the handler later on
|
||||
*/
|
||||
if (!(table->table = reopen_name_locked_table(thd, table)))
|
||||
unlock_table_name(thd, table);
|
||||
unlock_table_name(thd, table);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
|
||||
static int prepare_for_repair(THD* thd, TABLE_LIST* table,
|
||||
HA_CHECK_OPT *check_opt)
|
||||
HA_CHECK_OPT *check_opt)
|
||||
{
|
||||
DBUG_ENTER("prepare_for_repair");
|
||||
|
||||
@@ -966,13 +970,16 @@ static int prepare_for_repair(THD* thd, TABLE_LIST* table,
|
||||
}
|
||||
}
|
||||
|
||||
// now we should be able to open the partially repaired table
|
||||
// to finish the repair in the handler later on
|
||||
/*
|
||||
Now we should be able to open the partially repaired table
|
||||
to finish the repair in the handler later on.
|
||||
*/
|
||||
if (!(table->table = reopen_name_locked_table(thd, table)))
|
||||
unlock_table_name(thd, table);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
|
||||
static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
HA_CHECK_OPT* check_opt,
|
||||
const char *operator_name,
|
||||
|
||||
Reference in New Issue
Block a user