List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:September 9 2011 7:21am
Subject:bzr push into mysql-5.5 branch (vasil.dimov:3527 to 3528)
View as plain text  
 3528 Vasil Dimov	2011-09-09 [merge]
      Merge mysql-5.1 -> mysql-5.5

    modified:
      storage/innobase/row/row0sel.c
 3527 Marko Mäkelä	2011-09-08 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/page0page.h
      storage/innobase/include/row0upd.ic
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:marko.makela@stripped
+++ b/storage/innobase/row/row0sel.c	revid:vasil.dimov@strippedom-20110909071254-jb86bz87bx33zyje
@@ -63,7 +63,13 @@ Created 12/19/1997 Heikki Tuuri
 
 /* Number of rows fetched, after which to start prefetching; MySQL interface
 has another parameter */
-#define SEL_PREFETCH_LIMIT	1
+/* The prefetch code in the internal SQL is disabled because it has probably
+never been used and has been found to contain a memory leak and a bug of
+accessing uninitialized memory. Some simple performance tests show that
+disabling it makes no difference in performance. It will be removed, but
+until the removal happens we disable it by setting SEL_PREFETCH_LIMIT to a
+high value. */
+#define SEL_PREFETCH_LIMIT	1000000000
 
 /* When a select has accessed about this many pages, it returns control back
 to que_run_threads: this is to allow canceling runaway queries */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (vasil.dimov:3527 to 3528) vasil.dimov9 Sep