Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
97916e9b
Commit
97916e9b
authored
Sep 13, 2011
by
Vasil Dimov
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1 -> mysql-5.5
parents
3d09f323
3cd36cb0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
storage/innobase/row/row0sel.c
storage/innobase/row/row0sel.c
+4
-8
No files found.
storage/innobase/row/row0sel.c
View file @
97916e9b
...
@@ -63,13 +63,7 @@ Created 12/19/1997 Heikki Tuuri
...
@@ -63,13 +63,7 @@ Created 12/19/1997 Heikki Tuuri
/* Number of rows fetched, after which to start prefetching; MySQL interface
/* Number of rows fetched, after which to start prefetching; MySQL interface
has another parameter */
has another parameter */
/* The prefetch code in the internal SQL is disabled because it has probably
#define SEL_PREFETCH_LIMIT 1
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
/* When a select has accessed about this many pages, it returns control back
to que_run_threads: this is to allow canceling runaway queries */
to que_run_threads: this is to allow canceling runaway queries */
...
@@ -508,7 +502,7 @@ sel_col_prefetch_buf_alloc(
...
@@ -508,7 +502,7 @@ sel_col_prefetch_buf_alloc(
sel_buf
=
column
->
prefetch_buf
+
i
;
sel_buf
=
column
->
prefetch_buf
+
i
;
sel_buf
->
data
=
NULL
;
sel_buf
->
data
=
NULL
;
sel_buf
->
len
=
0
;
sel_buf
->
val_buf_size
=
0
;
sel_buf
->
val_buf_size
=
0
;
}
}
}
}
...
@@ -533,6 +527,8 @@ sel_col_prefetch_buf_free(
...
@@ -533,6 +527,8 @@ sel_col_prefetch_buf_free(
mem_free
(
sel_buf
->
data
);
mem_free
(
sel_buf
->
data
);
}
}
}
}
mem_free
(
prefetch_buf
);
}
}
/*********************************************************************//**
/*********************************************************************//**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment