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

revert open_ltable changing

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2002-11-23 23:21:49 +02:00
parent d6b646d4fc
commit c8d8367021
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/mysql_priv.h
View File

@ -448,8 +448,7 @@ void kill_delayed_threads(void);
int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, ORDER *order, int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, ORDER *order,
ha_rows rows, ulong options); ha_rows rows, ulong options);
int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok=0); int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok=0);
TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update, TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update);
bool multiopen= 0);
TABLE *open_table(THD *thd,const char *db,const char *table,const char *alias, TABLE *open_table(THD *thd,const char *db,const char *table,const char *alias,
bool *refresh); bool *refresh);
TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table); TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table);

17
sql/sql_base.cc
View File

@ -1615,24 +1615,17 @@ static bool check_lock_and_start_stmt(THD *thd, TABLE *table,
table_list->table table table_list->table table
*/ */
TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type, TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type)
bool multiopen)
{ {
TABLE *table; TABLE *table;
bool refresh; bool refresh;
DBUG_ENTER("open_ltable"); DBUG_ENTER("open_ltable");
thd->proc_info="Opening table"; thd->proc_info="Opening table";
if (table_list->next && multiopen) while (!(table=open_table(thd,table_list->db,
{ table_list->real_name,table_list->alias,
while (open_tables(thd,table_list) && refresh) ; &refresh)) && refresh) ;
table= table_list->table;
}
else
while (!(table= open_table(thd,table_list->db,
table_list->real_name,table_list->alias,
&refresh)) && refresh) ;
if (table) if (table)
{ {
#if defined( __WIN__) || defined(OS2) #if defined( __WIN__) || defined(OS2)