List:Commits« Previous MessageNext Message »
From:jani Date:January 16 2006 9:15pm
Subject:bk commit into 5.0 tree (jani:1.2028)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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.2028 06/01/16 23:15:00 jani@stripped +1 -0
  Changed condition similar to code in 4.1.

  sql/sql_handler.cc
    1.81 06/01/16 23:12:40 jani@stripped +4 -3
    Changed condition similar to code in 4.1.

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.80/sql/sql_handler.cc	2006-01-12 20:49:42 +02:00
+++ 1.81/sql/sql_handler.cc	2006-01-16 23:12:40 +02:00
@@ -421,12 +421,13 @@
   if (!lock)
     goto err0; // mysql_lock_tables() printed error message already
 
-  if (cond && ((!cond->fixed &&
-                cond->fix_fields(thd, &cond)) || cond->check_cols(1)))
+  if (cond)
   {
     if (table->query_id != thd->query_id)
       cond->cleanup();                          // File was reopened
-    goto err0;
+    if ((!cond->fixed &&
+	 cond->fix_fields(thd, &cond)) || cond->check_cols(1))
+      goto err0;
   }
 
   if (keyname)
Thread
bk commit into 5.0 tree (jani:1.2028)jani16 Jan