bzr push into mysql-trunk branch (vasil.dimov:3453 to 3454)

[vasil.dimov]

 3454 Vasil Dimov	2011-09-09 [merge]
      Merge mysql-5.5 -> mysql-trunk

    modified:
      storage/innobase/row/row0sel.c
 3453 Bjorn Munch	2011-09-08
      11769332 followup: remove tests from disabled-weekly too

    modified:
      mysql-test/collections/disabled-weekly.list
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:bjorn.munch@stripped
+++ b/storage/innobase/row/row0sel.c	revid:vasil.dimov@stripped
@@ -65,7 +65,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).