[Commits] Rev 2892: Fix of reverting changes in depend_on list. in file:///home/bell/maria/bzr/work-maria-5.3-fix/

sanja at askmonty.org sanja at askmonty.org
Fri Jan 21 09:56:56 EET 2011


At file:///home/bell/maria/bzr/work-maria-5.3-fix/

------------------------------------------------------------
revno: 2892
revision-id: sanja at askmonty.org-20110121075655-ma98piki4zuc432z
parent: sergii at pisem.net-20110114205155-i8poq0jti8o8mob1
committer: sanja at askmonty.org
branch nick: work-maria-5.3-fix
timestamp: Fri 2011-01-21 09:56:55 +0200
message:
  Fix of reverting changes in depend_on list.
-------------- next part --------------
=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2011-01-15 19:14:36 +0000
+++ b/sql/item_cmpfunc.cc	2011-01-21 07:56:55 +0000
@@ -1813,7 +1813,9 @@ Item *Item_in_optimizer::expr_cache_inse
       (expr_cache= set_expr_cache(thd, depends_on)))
     DBUG_RETURN(expr_cache);
 
-  depends_on.pop();
+  /* no cache => return list in original state just to be safe */
+  for (uint i= 0; i < args[0]->cols(); i++)
+    depends_on.pop();
   DBUG_RETURN(this);
 }
 



More information about the commits mailing list