merged

d2adc38c · serg@serg.mylan · 172ab0ab · 924de893 · d2adc38c · d2adc38c
Commit d2adc38c authored Jun 25, 2004 by serg@serg.mylan
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sql/opt_range.cc sql/opt_range.cc +0 -3

sql/sql_select.cc sql/sql_select.cc +2 -0

No files found.
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -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)
 	  {

--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -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)