diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-09-09 10:12:54 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-09-09 10:12:54 +0300 |
| commit | fa60b162c2155653faf20462ebe0a8b1857ac4c6 (patch) | |
| tree | 052e0753a96d542acf6956d1f98bd27a95130497 /storage | |
| parent | 109185f1ef1573de50d9c5c406e41504dc401226 (diff) | |
| parent | 13fefeb04ade34418cd9d99aa93bffb69fdae27e (diff) | |
| download | mariadb-git-fa60b162c2155653faf20462ebe0a8b1857ac4c6.tar.gz | |
Merge mysql-5.1 -> mysql-5.5
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0sel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c index a1039010d00..3cf2b48744a 100644 --- a/storage/innobase/row/row0sel.c +++ b/storage/innobase/row/row0sel.c @@ -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 */ |