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
e3eafe84
Commit
e3eafe84
authored
Feb 12, 2010
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Plain Diff
Merge fix for BUG49628 to mysql-5.1-bugteam.
parents
1805fcdc
62933c50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
0 deletions
+34
-0
mysql-test/r/myisam.result
mysql-test/r/myisam.result
+13
-0
mysql-test/t/myisam.test
mysql-test/t/myisam.test
+13
-0
storage/myisam/mi_dynrec.c
storage/myisam/mi_dynrec.c
+8
-0
No files found.
mysql-test/r/myisam.result
View file @
e3eafe84
...
@@ -2313,4 +2313,17 @@ CHECK TABLE t1;
...
@@ -2313,4 +2313,17 @@ CHECK TABLE t1;
Table Op Msg_type Msg_text
Table Op Msg_type Msg_text
test.t1 check status OK
test.t1 check status OK
DROP TABLE t1;
DROP TABLE t1;
#
# BUG#49628 - corrupt table after legal SQL, LONGTEXT column
#
CREATE TABLE t1(a INT, b LONGTEXT, UNIQUE(a));
REPLACE INTO t1 VALUES
(1,
REPEAT('a', 129015)),(1, NULL),
(2,
NULL),(3, NULL),(4, NULL),(5, NULL),(6, NULL),(7, NULL),
(1,
REPEAT('b', 129016)),(1, NULL),
(1,
REPEAT('c', 129015)),(1, REPEAT('d', 129015));
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
DROP TABLE t1;
End of 5.1 tests
End of 5.1 tests
mysql-test/t/myisam.test
View file @
e3eafe84
...
@@ -1563,5 +1563,18 @@ SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
...
@@ -1563,5 +1563,18 @@ SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
CHECK
TABLE
t1
;
CHECK
TABLE
t1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# BUG#49628 - corrupt table after legal SQL, LONGTEXT column
--
echo
#
CREATE
TABLE
t1
(
a
INT
,
b
LONGTEXT
,
UNIQUE
(
a
));
REPLACE
INTO
t1
VALUES
(
1
,
REPEAT
(
'a'
,
129015
)),(
1
,
NULL
),
(
2
,
NULL
),(
3
,
NULL
),(
4
,
NULL
),(
5
,
NULL
),(
6
,
NULL
),(
7
,
NULL
),
(
1
,
REPEAT
(
'b'
,
129016
)),(
1
,
NULL
),
(
1
,
REPEAT
(
'c'
,
129015
)),(
1
,
REPEAT
(
'd'
,
129015
));
CHECK
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
End
of
5.1
tests
--
echo
End
of
5.1
tests
storage/myisam/mi_dynrec.c
View file @
e3eafe84
...
@@ -933,8 +933,16 @@ static int update_dynamic_record(MI_INFO *info, my_off_t filepos, uchar *record,
...
@@ -933,8 +933,16 @@ static int update_dynamic_record(MI_INFO *info, my_off_t filepos, uchar *record,
}
}
if
(
block_info
.
next_filepos
!=
HA_OFFSET_ERROR
)
if
(
block_info
.
next_filepos
!=
HA_OFFSET_ERROR
)
{
/*
delete_dynamic_record() may change data file position.
IO cache must be notified as it may still have cached
data, which has to be flushed later.
*/
info
->
rec_cache
.
seek_not_done
=
1
;
if
(
delete_dynamic_record
(
info
,
block_info
.
next_filepos
,
1
))
if
(
delete_dynamic_record
(
info
,
block_info
.
next_filepos
,
1
))
goto
err
;
goto
err
;
}
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
err:
err:
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
...
...
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