1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge mysql.com:/home/hf/work/mysql-5.0.clean

into  mysql.com:/home/hf/work/mysql-5.1.clean
This commit is contained in:
holyfoot/hf@deer.(none)
2006-11-08 19:09:39 +04:00
45 changed files with 1802 additions and 231 deletions

View File

@ -4154,7 +4154,6 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
goto send_result;
}
table->table->pos_in_table_list= table;
if ((table->table->db_stat & HA_READ_ONLY) && open_for_modify)
{
char buff[FN_REFLEN + MYSQL_ERRMSG_SIZE];
@ -6737,8 +6736,6 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables,
}
else
{
t->pos_in_table_list= table;
if (t->file->ha_table_flags() & HA_HAS_CHECKSUM &&
!(check_opt->flags & T_EXTEND))
protocol->store((ulonglong)t->file->checksum());