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
511a89d7
Commit
511a89d7
authored
Aug 26, 2008
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Plain Diff
merge (updated to latest mysql-5.1-bugteam before push)
parents
84dc95cf
d2541eac
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
3 deletions
+40
-3
mysql-test/r/myisam.result
mysql-test/r/myisam.result
+22
-0
mysql-test/t/myisam.test
mysql-test/t/myisam.test
+15
-0
storage/myisam/mi_create.c
storage/myisam/mi_create.c
+1
-1
storage/myisam/rt_index.c
storage/myisam/rt_index.c
+2
-2
No files found.
mysql-test/r/myisam.result
View file @
511a89d7
...
...
@@ -1831,6 +1831,28 @@ id ref
3 2
4 5
DROP TABLE t1, t2;
CREATE TABLE t1 (a INT) ENGINE=MyISAM CHECKSUM=1 ROW_FORMAT=DYNAMIC;
INSERT INTO t1 VALUES (0);
UPDATE t1 SET a=1;
SELECT a FROM t1;
a
1
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
INSERT INTO t1 VALUES (0), (5), (4), (2);
UPDATE t1 SET a=2;
SELECT a FROM t1;
a
2
2
2
2
2
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
DROP TABLE t1;
End of 5.0 tests
create table t1 (a int not null, key `a` (a) key_block_size=1024);
show create table t1;
...
...
mysql-test/t/myisam.test
View file @
511a89d7
...
...
@@ -1169,6 +1169,21 @@ SELECT * FROM t1;
DROP
TABLE
t1
,
t2
;
#
# Bug#37310: 'on update CURRENT_TIMESTAMP' option crashes the table
#
CREATE
TABLE
t1
(
a
INT
)
ENGINE
=
MyISAM
CHECKSUM
=
1
ROW_FORMAT
=
DYNAMIC
;
INSERT
INTO
t1
VALUES
(
0
);
UPDATE
t1
SET
a
=
1
;
SELECT
a
FROM
t1
;
CHECK
TABLE
t1
;
INSERT
INTO
t1
VALUES
(
0
),
(
5
),
(
4
),
(
2
);
UPDATE
t1
SET
a
=
2
;
SELECT
a
FROM
t1
;
CHECK
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
...
...
storage/myisam/mi_create.c
View file @
511a89d7
...
...
@@ -196,7 +196,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
packed
=
(
packed
+
7
)
/
8
;
if
(
pack_reclength
!=
INT_MAX32
)
pack_reclength
+=
reclength
+
packed
+
test
(
test_all_bits
(
options
,
HA_OPTION_CHECKSUM
|
HA_PACK_RECORD
));
test
(
test_all_bits
(
options
,
HA_OPTION_CHECKSUM
|
HA_
OPTION_
PACK_RECORD
));
min_pack_length
+=
packed
;
if
(
!
ci
->
data_file_length
&&
ci
->
max_rows
)
...
...
storage/myisam/rt_index.c
View file @
511a89d7
...
...
@@ -389,7 +389,7 @@ int rtree_get_first(MI_INFO *info, uint keynr, uint key_length)
info
->
rtree_recursion_depth
=
-
1
;
info
->
buff_used
=
1
;
return
rtree_get_req
(
info
,
&
keyinfo
[
keynr
]
,
key_length
,
root
,
0
);
return
rtree_get_req
(
info
,
keyinfo
,
key_length
,
root
,
0
);
}
...
...
@@ -436,7 +436,7 @@ int rtree_get_next(MI_INFO *info, uint keynr, uint key_length)
return
-
1
;
}
return
rtree_get_req
(
info
,
&
keyinfo
[
keynr
]
,
key_length
,
root
,
0
);
return
rtree_get_req
(
info
,
keyinfo
,
key_length
,
root
,
0
);
}
}
...
...
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