mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50

Browse source 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  SCCS merged
sql/sql_handler.cc:
  SCCS merged
This commit is contained in:
unknown 2007-08-16 12:03:49 -06:00
commit 430df009a0
3 changed files with 0 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sql/mysql_priv.h
View file

@ -1278,7 +1278,6 @@ bool mysql_ha_read(THD *, TABLE_LIST *,enum enum_ha_read_modes,char *,
List<Item> *,enum ha_rkey_function,Item *,ha_rows,ha_rows); List<Item> *,enum ha_rkey_function,Item *,ha_rows,ha_rows);
int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags, int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags,
bool is_locked); bool is_locked);
void mysql_ha_mark_tables_for_reopen(THD *thd, TABLE *table);
/* mysql_ha_flush mode_flags bits */ /* mysql_ha_flush mode_flags bits */
#define MYSQL_HA_CLOSE_FINAL 0x00 #define MYSQL_HA_CLOSE_FINAL 0x00
#define MYSQL_HA_REOPEN_ON_USAGE 0x01 #define MYSQL_HA_REOPEN_ON_USAGE 0x01

7
sql/sql_base.cc
View file

@ -1217,13 +1217,6 @@ void close_thread_tables(THD *thd, bool lock_in_use, bool skip_derived)
DBUG_PRINT("info", ("thd->open_tables: 0x%lx", (long) thd->open_tables)); DBUG_PRINT("info", ("thd->open_tables: 0x%lx", (long) thd->open_tables));
/*
End open index scans and table scans and remove references to the tables
from the handler tables hash. After this preparation it is safe to close
the tables.
*/
mysql_ha_mark_tables_for_reopen(thd, thd->open_tables);
found_old_table= 0; found_old_table= 0;
while (thd->open_tables) while (thd->open_tables)
found_old_table|= close_thread_table(thd, &thd->open_tables); found_old_table|= close_thread_table(thd, &thd->open_tables);

45
sql/sql_handler.cc
View file

@ -758,48 +758,3 @@ static int mysql_ha_flush_table(THD *thd, TABLE **table_ptr, uint mode_flags)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*
Mark tables for reopen.
SYNOPSIS
mysql_ha_mark_tables_for_reopen()
thd Thread identifier.
table Table list to mark for reopen.
DESCRIPTION
For each table found in the handler hash mark it as closed
(ready for reopen) and end all index/table scans.
NOTE
The caller must lock LOCK_open.
*/
void mysql_ha_mark_tables_for_reopen(THD *thd, TABLE *table)
{
DBUG_ENTER("mysql_ha_mark_tables_for_reopen");
safe_mutex_assert_owner(&LOCK_open);
for (; table; table= table->next)
{
/*
Some elements in open table list, for example placeholders used for
name-locking, can have alias set to 0.
*/
if (table->alias)
{
TABLE_LIST *hash_tables;
if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash,
(uchar*) table->alias,
strlen(table->alias) + 1)))
{
/* Mark table as ready for reopen. */
hash_tables->table= NULL;
/* End open index/table scans. */
table->file->ha_index_or_rnd_end();
}
}
}
DBUG_VOID_RETURN;
}