mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-6916 REPAIR VIEW / mysql migration
from: r4407
This commit is contained in:
committed by
Daniel Black
parent
e5191dd11b
commit
c8dbef22ad
@ -314,7 +314,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
HA_CHECK_OPT *),
|
||||
int (handler::*operator_func)(THD *,
|
||||
HA_CHECK_OPT *),
|
||||
int (view_operator_func)(THD *, TABLE_LIST*))
|
||||
int (view_operator_func)(THD *, TABLE_LIST*,
|
||||
HA_CHECK_OPT *))
|
||||
{
|
||||
TABLE_LIST *table;
|
||||
SELECT_LEX *select= &thd->lex->select_lex;
|
||||
@ -380,7 +381,18 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
lex->query_tables_own_last= 0;
|
||||
|
||||
if (view_operator_func == NULL)
|
||||
{
|
||||
table->required_type=FRMTYPE_TABLE;
|
||||
DBUG_ASSERT(!lex->only_view);
|
||||
}
|
||||
else if (lex->only_view)
|
||||
{
|
||||
table->required_type= FRMTYPE_VIEW;
|
||||
}
|
||||
else if (!lex->only_view && lex->sql_command == SQLCOM_REPAIR)
|
||||
{
|
||||
table->required_type= FRMTYPE_TABLE;
|
||||
}
|
||||
|
||||
if (lex->sql_command == SQLCOM_CHECK ||
|
||||
lex->sql_command == SQLCOM_REPAIR ||
|
||||
@ -506,9 +518,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
}
|
||||
|
||||
/*
|
||||
CHECK TABLE command is only command where VIEW allowed here and this
|
||||
command use only temporary teble method for VIEWs resolving => there
|
||||
can't be VIEW tree substitition of join view => if opening table
|
||||
CHECK/REPAIR TABLE command is only command where VIEW allowed here and
|
||||
this command use only temporary table method for VIEWs resolving =>
|
||||
there can't be VIEW tree substitition of join view => if opening table
|
||||
succeed then table->table will have real TABLE pointer as value (in
|
||||
case of join view substitution table->table can be 0, but here it is
|
||||
impossible)
|
||||
@ -521,7 +533,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
ER_CHECK_NO_SUCH_TABLE, ER(ER_CHECK_NO_SUCH_TABLE));
|
||||
/* if it was a view will check md5 sum */
|
||||
if (table->view &&
|
||||
view_checksum(thd, table) == HA_ADMIN_WRONG_CHECKSUM)
|
||||
view_check(thd, table, check_opt) == HA_ADMIN_WRONG_CHECKSUM)
|
||||
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
||||
ER_VIEW_CHECKSUM, ER(ER_VIEW_CHECKSUM));
|
||||
if (thd->stmt_da->is_error() &&
|
||||
@ -536,7 +548,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
if (table->view)
|
||||
{
|
||||
DBUG_PRINT("admin", ("calling view_operator_func"));
|
||||
result_code= (*view_operator_func)(thd, table);
|
||||
result_code= (*view_operator_func)(thd, table, check_opt);
|
||||
goto send_result;
|
||||
}
|
||||
|
||||
@ -867,6 +879,22 @@ send_result_message:
|
||||
fatal_error=1;
|
||||
break;
|
||||
}
|
||||
case HA_ADMIN_VIEW_REPAIR_IS_DONE:
|
||||
{
|
||||
protocol->store(STRING_WITH_LEN("status"), system_charset_info);
|
||||
protocol->store(ER(ER_VIEW_REPAIR_IS_DONE),
|
||||
strlen(ER(ER_VIEW_REPAIR_IS_DONE)),
|
||||
system_charset_info);
|
||||
break;
|
||||
}
|
||||
case HA_ADMIN_NEEDS_REPAIR:
|
||||
{
|
||||
protocol->store(STRING_WITH_LEN("status"), system_charset_info);
|
||||
protocol->store(ER(ER_NEEDS_REPAIR),
|
||||
strlen(ER(ER_NEEDS_REPAIR)),
|
||||
system_charset_info);
|
||||
break;
|
||||
}
|
||||
|
||||
default: // Probably HA_ADMIN_INTERNAL_ERROR
|
||||
{
|
||||
@ -1071,7 +1099,7 @@ bool Check_table_statement::execute(THD *thd)
|
||||
|
||||
res= mysql_admin_table(thd, first_table, &m_lex->check_opt, "check",
|
||||
lock_type, 0, 0, HA_OPEN_FOR_REPAIR, 0,
|
||||
&handler::ha_check, &view_checksum);
|
||||
&handler::ha_check, &view_check);
|
||||
|
||||
m_lex->select_lex.table_list.first= first_table;
|
||||
m_lex->query_tables= first_table;
|
||||
@ -1126,7 +1154,7 @@ bool Repair_table_statement::execute(THD *thd)
|
||||
TL_WRITE, 1,
|
||||
test(m_lex->check_opt.sql_flags & TT_USEFRM),
|
||||
HA_OPEN_FOR_REPAIR, &prepare_for_repair,
|
||||
&handler::ha_repair, 0);
|
||||
&handler::ha_repair, &view_repair);
|
||||
|
||||
/* ! we write after unlocking the table */
|
||||
if (!res && !m_lex->no_write_to_binlog)
|
||||
|
Reference in New Issue
Block a user