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
f4e5069f
Commit
f4e5069f
authored
May 11, 2010
by
Vasil Dimov
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1-innodb from bk-internal locally
parents
703309a3
537abedc
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
74 additions
and
7 deletions
+74
-7
mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
+17
-0
mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
+22
-0
storage/innodb_plugin/btr/btr0btr.c
storage/innodb_plugin/btr/btr0btr.c
+1
-0
storage/innodb_plugin/buf/buf0lru.c
storage/innodb_plugin/buf/buf0lru.c
+10
-0
storage/innodb_plugin/include/buf0buf.ic
storage/innodb_plugin/include/buf0buf.ic
+5
-0
storage/innodb_plugin/include/rem0cmp.h
storage/innodb_plugin/include/rem0cmp.h
+3
-1
storage/innodb_plugin/page/page0zip.c
storage/innodb_plugin/page/page0zip.c
+1
-1
storage/innodb_plugin/rem/rem0cmp.c
storage/innodb_plugin/rem/rem0cmp.c
+6
-1
storage/innodb_plugin/row/row0merge.c
storage/innodb_plugin/row/row0merge.c
+9
-4
No files found.
mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
0 → 100644
View file @
f4e5069f
create table bug53290 (x bigint) engine=innodb;
insert into bug53290 () values (),(),(),(),(),(),(),(),(),(),(),();
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
insert into bug53290 select * from bug53290;
alter table bug53290 add unique index `idx` (x);
drop table bug53290;
mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
0 → 100644
View file @
f4e5069f
--
source
include
/
have_innodb_plugin
.
inc
create
table
bug53290
(
x
bigint
)
engine
=
innodb
;
insert
into
bug53290
()
values
(),(),(),(),(),(),(),(),(),(),(),();
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
insert
into
bug53290
select
*
from
bug53290
;
alter
table
bug53290
add
unique
index
`idx`
(
x
);
drop
table
bug53290
;
storage/innodb_plugin/btr/btr0btr.c
View file @
f4e5069f
...
...
@@ -2000,6 +2000,7 @@ func_start:
goto
insert_empty
;
}
}
else
if
(
UNIV_UNLIKELY
(
insert_left
))
{
ut_a
(
n_iterations
>
0
);
first_rec
=
page_rec_get_next
(
page_get_infimum_rec
(
page
));
move_limit
=
page_rec_get_next
(
btr_cur_get_rec
(
cursor
));
}
else
{
...
...
storage/innodb_plugin/buf/buf0lru.c
View file @
f4e5069f
...
...
@@ -1393,7 +1393,12 @@ buf_LRU_free_block(
ut_ad
(
buf_page_in_file
(
bpage
));
ut_ad
(
bpage
->
in_LRU_list
);
ut_ad
(
!
bpage
->
in_flush_list
==
!
bpage
->
oldest_modification
);
#if UNIV_WORD_SIZE == 4
/* On 32-bit systems, there is no padding in buf_page_t. On
other systems, Valgrind could complain about uninitialized pad
bytes. */
UNIV_MEM_ASSERT_RW
(
bpage
,
sizeof
*
bpage
);
#endif
if
(
!
buf_page_can_relocate
(
bpage
))
{
...
...
@@ -1688,7 +1693,12 @@ buf_LRU_block_remove_hashed_page(
ut_a
(
buf_page_get_io_fix
(
bpage
)
==
BUF_IO_NONE
);
ut_a
(
bpage
->
buf_fix_count
==
0
);
#if UNIV_WORD_SIZE == 4
/* On 32-bit systems, there is no padding in
buf_page_t. On other systems, Valgrind could complain
about uninitialized pad bytes. */
UNIV_MEM_ASSERT_RW
(
bpage
,
sizeof
*
bpage
);
#endif
buf_LRU_remove_block
(
bpage
);
...
...
storage/innodb_plugin/include/buf0buf.ic
View file @
f4e5069f
...
...
@@ -931,7 +931,12 @@ buf_page_hash_get(
ut_a(buf_page_in_file(bpage));
ut_ad(bpage->in_page_hash);
ut_ad(!bpage->in_zip_hash);
#if UNIV_WORD_SIZE == 4
/* On 32-bit systems, there is no padding in
buf_page_t. On other systems, Valgrind could complain
about uninitialized pad bytes. */
UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
#endif
}
return(bpage);
...
...
storage/innodb_plugin/include/rem0cmp.h
View file @
f4e5069f
...
...
@@ -148,7 +148,9 @@ cmp_rec_rec_simple(
const
rec_t
*
rec2
,
/*!< in: physical record */
const
ulint
*
offsets1
,
/*!< in: rec_get_offsets(rec1, ...) */
const
ulint
*
offsets2
,
/*!< in: rec_get_offsets(rec2, ...) */
const
dict_index_t
*
index
);
/*!< in: data dictionary index */
const
dict_index_t
*
index
,
/*!< in: data dictionary index */
ibool
*
null_eq
);
/*!< out: set to TRUE if
found matching null values */
/*************************************************************//**
This function is used to compare two physical records. Only the common
first fields are compared, and if an externally stored field is
...
...
storage/innodb_plugin/page/page0zip.c
View file @
f4e5069f
...
...
@@ -571,7 +571,7 @@ page_zip_dir_encode(
/* Traverse the list of stored records in the collation order,
starting from the first user record. */
rec
=
page
+
PAGE_NEW_INFIMUM
,
TRUE
;
rec
=
page
+
PAGE_NEW_INFIMUM
;
i
=
0
;
...
...
storage/innodb_plugin/rem/rem0cmp.c
View file @
f4e5069f
...
...
@@ -706,7 +706,9 @@ cmp_rec_rec_simple(
const
rec_t
*
rec2
,
/*!< in: physical record */
const
ulint
*
offsets1
,
/*!< in: rec_get_offsets(rec1, ...) */
const
ulint
*
offsets2
,
/*!< in: rec_get_offsets(rec2, ...) */
const
dict_index_t
*
index
)
/*!< in: data dictionary index */
const
dict_index_t
*
index
,
/*!< in: data dictionary index */
ibool
*
null_eq
)
/*!< out: set to TRUE if
found matching null values */
{
ulint
rec1_f_len
;
/*!< length of current field in rec1 */
const
byte
*
rec1_b_ptr
;
/*!< pointer to the current byte
...
...
@@ -753,6 +755,9 @@ cmp_rec_rec_simple(
||
rec2_f_len
==
UNIV_SQL_NULL
)
{
if
(
rec1_f_len
==
rec2_f_len
)
{
if
(
null_eq
)
{
*
null_eq
=
TRUE
;
}
goto
next_field
;
...
...
storage/innodb_plugin/row/row0merge.c
View file @
f4e5069f
...
...
@@ -1075,11 +1075,14 @@ row_merge_cmp(
record to be compared */
const
ulint
*
offsets1
,
/*!< in: first record offsets */
const
ulint
*
offsets2
,
/*!< in: second record offsets */
const
dict_index_t
*
index
)
/*!< in: index */
const
dict_index_t
*
index
,
/*!< in: index */
ibool
*
null_eq
)
/*!< out: set to TRUE if
found matching null values */
{
int
cmp
;
cmp
=
cmp_rec_rec_simple
(
mrec1
,
mrec2
,
offsets1
,
offsets2
,
index
);
cmp
=
cmp_rec_rec_simple
(
mrec1
,
mrec2
,
offsets1
,
offsets2
,
index
,
null_eq
);
#ifdef UNIV_DEBUG
if
(
row_merge_print_cmp
)
{
...
...
@@ -1445,11 +1448,13 @@ corrupt:
}
while
(
mrec0
&&
mrec1
)
{
ibool
null_eq
=
FALSE
;
switch
(
row_merge_cmp
(
mrec0
,
mrec1
,
offsets0
,
offsets1
,
index
))
{
offsets0
,
offsets1
,
index
,
&
null_eq
))
{
case
0
:
if
(
UNIV_UNLIKELY
(
dict_index_is_unique
(
index
)))
{
(
dict_index_is_unique
(
index
)
&&
!
null_eq
))
{
innobase_rec_to_mysql
(
table
,
mrec0
,
index
,
offsets0
);
mem_heap_free
(
heap
);
...
...
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