List:Commits« Previous MessageNext Message »
From:konstantin Date:November 1 2007 2:08pm
Subject:bk commit into 5.1 tree (kostja:1.2612) BUG#12713
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-01 17:08:02+03:00, kostja@bodhi.(none) +1 -0
  Use thd->is_error() instead of direct access to thd->net.report_error
  in evaluate_join_record().
  
  A minor cleanup required for the fix for Bug#12713.

  sql/sql_select.cc@stripped, 2007-11-01 17:07:59+03:00, kostja@bodhi.(none) +5 -6
    Use thd->is_error() instead of direct access to thd->net.report_error
    in evaluate_join_record()

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-10-30 20:08:13 +03:00
+++ b/sql/sql_select.cc	2007-11-01 17:07:59 +03:00
@@ -122,7 +122,7 @@ static int do_select(JOIN *join,List<Ite
 
 static enum_nested_loop_state
 evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
-                     int error, my_bool *report_error);
+                     int error);
 static enum_nested_loop_state
 evaluate_null_complemented_join_record(JOIN *join, JOIN_TAB *join_tab);
 static enum_nested_loop_state
@@ -10871,7 +10871,6 @@ sub_select(JOIN *join,JOIN_TAB *join_tab
 
   int error;
   enum_nested_loop_state rc;
-  my_bool *report_error= &(join->thd->net.report_error);
   READ_RECORD *info= &join_tab->read_record;
 
   if (join->resume_nested_loop)
@@ -10903,13 +10902,13 @@ sub_select(JOIN *join,JOIN_TAB *join_tab
     join->thd->row_count= 0;
 
     error= (*join_tab->read_first_record)(join_tab);
-    rc= evaluate_join_record(join, join_tab, error, report_error);
+    rc= evaluate_join_record(join, join_tab, error);
   }
 
   while (rc == NESTED_LOOP_OK)
   {
     error= info->read_record(info);
-    rc= evaluate_join_record(join, join_tab, error, report_error);
+    rc= evaluate_join_record(join, join_tab, error);
   }
 
   if (rc == NESTED_LOOP_NO_MORE_ROWS &&
@@ -10933,13 +10932,13 @@ sub_select(JOIN *join,JOIN_TAB *join_tab
 
 static enum_nested_loop_state
 evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
-                     int error, my_bool *report_error)
+                     int error)
 {
   bool not_used_in_distinct=join_tab->not_used_in_distinct;
   ha_rows found_records=join->found_records;
   COND *select_cond= join_tab->select_cond;
 
-  if (error > 0 || (*report_error))				// Fatal error
+  if (error > 0 || (join->thd->is_error()))     // Fatal error
     return NESTED_LOOP_ERROR;
   if (error < 0)
     return NESTED_LOOP_NO_MORE_ROWS;
Thread
bk commit into 5.1 tree (kostja:1.2612) BUG#12713konstantin1 Nov