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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
5e6006dd
Commit
5e6006dd
authored
Jun 22, 2010
by
Vasil Dimov
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1-innodb from bk-internal to my local tree
parents
f763381a
baf5c6ed
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
storage/innodb_plugin/ChangeLog
storage/innodb_plugin/ChangeLog
+6
-0
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.cc
+7
-0
No files found.
storage/innodb_plugin/ChangeLog
View file @
5e6006dd
...
@@ -5,6 +5,12 @@
...
@@ -5,6 +5,12 @@
Fix Bug#47991 InnoDB Dictionary Cache memory usage increases
Fix Bug#47991 InnoDB Dictionary Cache memory usage increases
indefinitely when renaming tables
indefinitely when renaming tables
2010-06-22 The InnoDB Team
* handler/ha_innodb.cc:
Fix Bug#54686: "field->col->mtype == type" assertion error at
row/row0sel.c
2010-06-21 The InnoDB Team
2010-06-21 The InnoDB Team
* dict/dict0load.c, fil/fil0fil.c:
* dict/dict0load.c, fil/fil0fil.c:
...
...
storage/innodb_plugin/handler/ha_innodb.cc
View file @
5e6006dd
...
@@ -5379,6 +5379,9 @@ ha_innobase::index_read(
...
@@ -5379,6 +5379,9 @@ ha_innobase::index_read(
prebuilt
->
index_usable
=
FALSE
;
prebuilt
->
index_usable
=
FALSE
;
DBUG_RETURN
(
HA_ERR_CRASHED
);
DBUG_RETURN
(
HA_ERR_CRASHED
);
}
}
if
(
UNIV_UNLIKELY
(
!
prebuilt
->
index_usable
))
{
DBUG_RETURN
(
HA_ERR_TABLE_DEF_CHANGED
);
}
/* Note that if the index for which the search template is built is not
/* Note that if the index for which the search template is built is not
necessarily prebuilt->index, but can also be the clustered index */
necessarily prebuilt->index, but can also be the clustered index */
...
@@ -7221,6 +7224,10 @@ ha_innobase::records_in_range(
...
@@ -7221,6 +7224,10 @@ ha_innobase::records_in_range(
n_rows
=
HA_POS_ERROR
;
n_rows
=
HA_POS_ERROR
;
goto
func_exit
;
goto
func_exit
;
}
}
if
(
UNIV_UNLIKELY
(
!
row_merge_is_index_usable
(
prebuilt
->
trx
,
index
)))
{
n_rows
=
HA_ERR_TABLE_DEF_CHANGED
;
goto
func_exit
;
}
heap
=
mem_heap_create
(
2
*
(
key
->
key_parts
*
sizeof
(
dfield_t
)
heap
=
mem_heap_create
(
2
*
(
key
->
key_parts
*
sizeof
(
dfield_t
)
+
sizeof
(
dtuple_t
)));
+
sizeof
(
dtuple_t
)));
...
...
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