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
a6975b89
Commit
a6975b89
authored
Jun 24, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug8321
parents
1960fbcf
12a640e2
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1155 additions
and
144 deletions
+1155
-144
include/my_base.h
include/my_base.h
+1
-0
myisam/mi_packrec.c
myisam/mi_packrec.c
+13
-2
myisam/myisampack.c
myisam/myisampack.c
+1138
-142
mysys/tree.c
mysys/tree.c
+3
-0
No files found.
include/my_base.h
View file @
a6975b89
...
...
@@ -367,6 +367,7 @@ enum ha_base_keytype {
#define HA_STATE_EXTEND_BLOCK 2048
#define HA_STATE_RNEXT_SAME 4096
/* rnext_same was called */
/* myisampack expects no more than 32 field types. */
enum
en_fieldtype
{
FIELD_LAST
=-
1
,
FIELD_NORMAL
,
FIELD_SKIP_ENDSPACE
,
FIELD_SKIP_PRESPACE
,
FIELD_SKIP_ZERO
,
FIELD_BLOB
,
FIELD_CONSTANT
,
FIELD_INTERVALL
,
FIELD_ZERO
,
...
...
myisam/mi_packrec.c
View file @
a6975b89
...
...
@@ -416,8 +416,19 @@ static uint find_longest_bitstream(uint16 *table, uint16 *end)
}
/* Read record from datafile */
/* Returns length of packed record, -1 if error */
/*
Read record from datafile.
SYNOPSIS
_mi_read_pack_record()
info A pointer to MI_INFO.
filepos File offset of the record.
buf RETURN The buffer to receive the record.
RETURN
0 on success
HA_ERR_WRONG_IN_RECORD or -1 on error
*/
int
_mi_read_pack_record
(
MI_INFO
*
info
,
my_off_t
filepos
,
byte
*
buf
)
{
...
...
myisam/myisampack.c
View file @
a6975b89
This diff is collapsed.
Click to expand it.
mysys/tree.c
View file @
a6975b89
...
...
@@ -263,6 +263,9 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
if
(
tree
->
flag
&
TREE_NO_DUPS
)
return
(
NULL
);
element
->
count
++
;
/* Avoid a wrap over of the count. */
if
(
!
element
->
count
)
element
->
count
--
;
}
DBUG_EXECUTE
(
"check_tree"
,
test_rb_tree
(
tree
->
root
););
return
element
;
...
...
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