1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

release cursors in return_zero_rows

Browse Source 
sql/opt_range.cc:
  incorrect fix removed. range optimizer is made slightly more stable vs. compiler optimizations
This commit is contained in:
unknown 2004-06-25 21:43:02 +02:00
parent b4336ad4e0
commit 00567fe634
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/opt_range.cc
View File

@ -629,7 +629,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
if (!records)
records++; /* purecov: inspected */
scan_time=(double) records / TIME_FOR_COMPARE+1;
read_time=(double) head->file->scan_time()+ scan_time + 1.0;
read_time=(double) head->file->scan_time()+ scan_time + 1.01;
if (head->force_index)
scan_time= read_time= DBL_MAX;
if (limit < records)
@ -716,9 +716,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
key++,idx++)
{
ha_rows found_records;
#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 95) && defined(__OPTIMIZE__)
volatile // gcc 2.95.3 bug in -O3 mode
#endif
double found_read_time;
if (*key)
{

2
sql/sql_select.cc
View File

@ -4128,6 +4128,8 @@ return_zero_rows(JOIN *join, select_result *result,TABLE_LIST *tables,
DBUG_RETURN(0);
}
join->join_free(0);
if (send_row)
{
for (TABLE_LIST *table=tables; table ; table=table->next)