database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/mysql-4.1

Browse Source 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/ha_myisam.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2003-08-09 12:57:39 -07:00
parent cbd85f9deb b9aa175cb2
commit b9a90dffb6
36 changed files with 329 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@ -788,6 +788,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
DBUG_RETURN(0);
}
table->query_id=thd->query_id;
table->clear_query_id=1;
thd->tmp_table_used= 1;
goto reset;
}
@ -2175,8 +2176,9 @@ bool setup_tables(TABLE_LIST *tables)
table->keys_in_use_for_query &= ~map;
}
table->used_keys &= table->keys_in_use_for_query;
if (table_list->shared)
if (table_list->shared || table->clear_query_id)
{
table->clear_query_id= 0;
/* Clear query_id that may have been set by previous select */
for (Field **ptr=table->field ; *ptr ; ptr++)
(*ptr)->query_id=0;