MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kroki Date:April 23 2006 8:12pm
Subject:bk commit into 5.0 tree (kroki:1.2156) BUG#16581
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash 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
  1.2156 06/04/24 00:12:33 kroki@stripped +1 -0
  Bug#16581: deadlock: server and client both read from connection in 'conc_sys'
             test
  
  Set JOIN::error so the failure of get_schema_tables_result() won't be
  forgotten on return from JOIN::exec() and the (unknown) error will be
  reported to the client.

  sql/sql_show.cc
    1.314 06/04/24 00:12:27 kroki@stripped +5 -0
    Mark join as failed so the error will be reported to the client.
    Return once error has been detected.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-bug16581

--- 1.313/sql/sql_show.cc	2006-03-20 13:17:41 +03:00
+++ 1.314/sql/sql_show.cc	2006-04-24 00:12:27 +04:00
@@ -3886,7 +3886,12 @@
 
       if (table_list->schema_table->fill_table(thd, table_list,
                                                tab->select_cond))
+      {
+        /* Mark this join as failed. */
+        join->error= 1;
         result= 1;
+        break;
+      }
       table_list->is_schema_table_processed= TRUE;
     }
   }
Thread
bk commit into 5.0 tree (kroki:1.2156) BUG#16581kroki23 Apr