diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-04 23:22:53 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-04 23:22:53 +0300 |
| commit | 0ac3b21340562cd7d9a01ad57b94b378569bdcee (patch) | |
| tree | 63809510cb93baca8254eae9a6e89e290209407a /sql/sql_base.cc | |
| parent | cbc817fa0c27a6a2388df1f482c1e66b8e2ec3de (diff) | |
| parent | fc78fef7968a652d2bf96ac5ee6d5f35faf7fcd9 (diff) | |
| download | mariadb-git-0ac3b21340562cd7d9a01ad57b94b378569bdcee.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
BitKeeper/etc/logging_ok:
Auto merged
Docs/manual.texi:
Merge
support-files/mysql.spec.sh:
Merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 4a05f2370f6..ed018eb3337 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -388,7 +388,7 @@ void close_thread_tables(THD *thd, bool locked) } thd->open_tables=0; /* Free tables to hold down open files */ - while (open_cache.records >= table_cache_size && unused_tables) + while (open_cache.records > table_cache_size && unused_tables) VOID(hash_delete(&open_cache,(byte*) unused_tables)); /* purecov: tested */ check_unused(); if (found_old_table) @@ -700,7 +700,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, else { /* Free cache if too big */ - while (open_cache.records >= table_cache_size && unused_tables) + while (open_cache.records > table_cache_size && unused_tables) VOID(hash_delete(&open_cache,(byte*) unused_tables)); /* purecov: tested */ /* make a new table */ @@ -1123,6 +1123,7 @@ static int open_unireg_entry(TABLE *entry,const char *db,const char *name, (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE | HA_GET_INDEX | HA_TRY_READ_ONLY), READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD, + ha_open_options, entry)) { DBUG_RETURN(1); @@ -1288,6 +1289,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db, (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE | HA_GET_INDEX | HA_TRY_READ_ONLY), READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD, + ha_open_options, tmp_table)) { DBUG_RETURN(0); @@ -1572,6 +1574,7 @@ int setup_fields(THD *thd, TABLE_LIST *tables, List<Item> &fields, DBUG_RETURN(-1); /* purecov: inspected */ if (item->with_sum_func && item->type() != Item::SUM_FUNC_ITEM) item->split_sum_func(*sum_func_list); + thd->used_tables|=item->used_tables(); } } DBUG_RETURN(test(thd->fatal_error)); |