List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 24 2006 4:20am
Subject:bk commit into 5.1 tree (pkarthick:1.2070)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of prem. When prem 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.2070 06/01/24 09:50:31 pkarthick@stripped +2 -0
  Merge bk://mysql.bkbits.net/mysql-5.1-new
  into  novell.com:/home/prem/bk/mysql-5.1

  sql/sql_class.cc
    1.241 06/01/24 09:50:25 pkarthick@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.524 06/01/24 09:50:25 pkarthick@stripped +0 -0
    Auto merged

# 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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-5.1/RESYNC

--- 1.523/sql/mysqld.cc	2006-01-18 20:32:47 +05:30
+++ 1.524/sql/mysqld.cc	2006-01-24 09:50:25 +05:30
@@ -2504,9 +2504,7 @@
     {
       NET *net= &thd->net;
       net->report_error= 1;
-#ifndef EMBEDDED_LIBRARY  /* TODO query cache in embedded library*/
       query_cache_abort(net);
-#endif
       if (!net->last_error[0])			// Return only first message
       {
 	strmake(net->last_error, str, sizeof(net->last_error)-1);

--- 1.240/sql/sql_class.cc	2006-01-18 15:14:19 +05:30
+++ 1.241/sql/sql_class.cc	2006-01-24 09:50:25 +05:30
@@ -985,7 +985,9 @@
   thd->sent_row_count++;
   if (!thd->vio_ok())
     DBUG_RETURN(0);
-  if (!thd->net.report_error)
+  if (thd->net.report_error)
+    protocol->remove_last_row();
+  else
     DBUG_RETURN(protocol->write());
   DBUG_RETURN(1);
 }
@@ -2036,10 +2038,8 @@
   cuted_fields= 0;
   transaction.savepoints= 0;
 
-#ifndef EMBEDDED_LIBRARY
   /* Surpress OK packets in case if we will execute statements */
   net.no_send_ok= TRUE;
-#endif
 }
 
 
Thread
bk commit into 5.1 tree (pkarthick:1.2070)pkarthick24 Jan