mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Move HA_EXTRA_NO_READCHECK to ha_open
Fixed bug in multi-table-delete Docs/manual.texi: Changelog include/mysql_com.h: Define MAX_CHAR_WIDTH myisam/mi_extra.c: Cleanup mysql-test/r/bdb.result: Bug test mysql-test/r/group_by.result: Bug test mysql-test/t/bdb.test: Bug test mysql-test/t/group_by.test: Bug test sql/ha_berkeley.cc: More debug statements sql/handler.cc: Move HA_EXTRA_NO_READCHECK to ha_open sql/records.cc: More DBUG statements sql/sql_analyse.cc: Cleanup sql/sql_base.cc: Move HA_EXTRA_NO_READCHECK to ha_open sql/sql_delete.cc: Fixed bug in multi-table-delete Cleanup sql/sql_select.cc: Move HA_EXTRA_NO_READCHECK to ha_open sql/sql_update.cc: Move HA_EXTRA_NO_READCHECK to ha_open
This commit is contained in:
@ -300,6 +300,7 @@ static void free_cache_entry(TABLE *table)
|
||||
|
||||
void free_io_cache(TABLE *table)
|
||||
{
|
||||
DBUG_ENTER("free_io_cache");
|
||||
if (table->io_cache)
|
||||
{
|
||||
close_cached_file(table->io_cache);
|
||||
@ -311,6 +312,7 @@ void free_io_cache(TABLE *table)
|
||||
my_free((gptr) table->record_pointers,MYF(0));
|
||||
table->record_pointers=0;
|
||||
}
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
/* Close all tables which aren't in use by any thread */
|
||||
@ -1301,7 +1303,6 @@ static int open_unireg_entry(THD *thd, TABLE *entry, const char *db,
|
||||
if (error)
|
||||
goto err;
|
||||
}
|
||||
(void) entry->file->extra(HA_EXTRA_NO_READCHECK); // Not needed in SQL
|
||||
DBUG_RETURN(0);
|
||||
err:
|
||||
DBUG_RETURN(1);
|
||||
@ -1499,7 +1500,6 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
tmp_table->file->extra(HA_EXTRA_NO_READCHECK); // Not needed in SQL
|
||||
tmp_table->reginfo.lock_type=TL_WRITE; // Simulate locked
|
||||
tmp_table->tmp_table = (tmp_table->file->has_transactions() ?
|
||||
TRANSACTIONAL_TMP_TABLE : TMP_TABLE);
|
||||
|
Reference in New Issue
Block a user