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
23544ee8
Commit
23544ee8
authored
Feb 19, 2003
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
parents
f96c1f60
3b41d79f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
22 deletions
+13
-22
myisam/mi_open.c
myisam/mi_open.c
+5
-1
myisam/myisamdef.h
myisam/myisamdef.h
+1
-1
myisam/rt_index.c
myisam/rt_index.c
+5
-5
myisam/rt_key.c
myisam/rt_key.c
+2
-15
No files found.
myisam/mi_open.c
View file @
23544ee8
...
@@ -484,6 +484,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
...
@@ -484,6 +484,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
if
(
mi_open_datafile
(
&
info
,
share
,
old_info
->
dfile
))
if
(
mi_open_datafile
(
&
info
,
share
,
old_info
->
dfile
))
goto
err
;
goto
err
;
errpos
=
5
;
errpos
=
5
;
have_rtree
=
old_info
->
rtree_recursion_state
!=
NULL
;
}
}
/* alloc and set up private structure parts */
/* alloc and set up private structure parts */
...
@@ -492,12 +493,15 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
...
@@ -492,12 +493,15 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
&
info
.
blobs
,
sizeof
(
MI_BLOB
)
*
share
->
base
.
blobs
,
&
info
.
blobs
,
sizeof
(
MI_BLOB
)
*
share
->
base
.
blobs
,
&
info
.
buff
,(
share
->
base
.
max_key_block_length
*
2
+
&
info
.
buff
,(
share
->
base
.
max_key_block_length
*
2
+
share
->
base
.
max_key_length
),
share
->
base
.
max_key_length
),
&
info
.
rtree_recursion_state
,
have_rtree
?
1024
:
0
,
&
info
.
lastkey
,
share
->
base
.
max_key_length
*
3
+
1
,
&
info
.
lastkey
,
share
->
base
.
max_key_length
*
3
+
1
,
&
info
.
filename
,
strlen
(
org_name
)
+
1
,
&
info
.
filename
,
strlen
(
org_name
)
+
1
,
&
info
.
rtree_recursion_state
,
have_rtree
?
1024
:
0
,
NullS
))
NullS
))
goto
err
;
goto
err
;
errpos
=
6
;
errpos
=
6
;
if
(
!
have_rtree
)
info
.
rtree_recursion_state
=
NULL
;
strmov
(
info
.
filename
,
org_name
);
strmov
(
info
.
filename
,
org_name
);
memcpy
(
info
.
blobs
,
share
->
blobs
,
sizeof
(
MI_BLOB
)
*
share
->
base
.
blobs
);
memcpy
(
info
.
blobs
,
share
->
blobs
,
sizeof
(
MI_BLOB
)
*
share
->
base
.
blobs
);
...
...
myisam/myisamdef.h
View file @
23544ee8
...
@@ -272,7 +272,7 @@ struct st_myisam_info {
...
@@ -272,7 +272,7 @@ struct st_myisam_info {
#ifdef THREAD
#ifdef THREAD
THR_LOCK_DATA
lock
;
THR_LOCK_DATA
lock
;
#endif
#endif
uchar
*
rtree_recursion_state
;
/* For RTREE */
uchar
*
rtree_recursion_state
;
/* For RTREE */
int
rtree_recursion_depth
;
int
rtree_recursion_depth
;
};
};
...
...
myisam/rt_index.c
View file @
23544ee8
...
@@ -53,7 +53,7 @@ static int rtree_find_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint search_flag, u
...
@@ -53,7 +53,7 @@ static int rtree_find_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint search_flag, u
int
res
;
int
res
;
uchar
*
page_buf
;
uchar
*
page_buf
;
int
k_len
;
int
k_len
;
int
*
saved_key
=
(
int
*
)(
info
->
rtree_recursion_state
+
level
*
sizeof
(
int
))
;
uint
*
saved_key
=
(
uint
*
)
(
info
->
rtree_recursion_state
)
+
level
;
if
(
!
(
page_buf
=
(
uchar
*
)
my_alloca
((
uint
)
keyinfo
->
block_length
)))
if
(
!
(
page_buf
=
(
uchar
*
)
my_alloca
((
uint
)
keyinfo
->
block_length
)))
{
{
...
@@ -114,7 +114,7 @@ static int rtree_find_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint search_flag, u
...
@@ -114,7 +114,7 @@ static int rtree_find_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint search_flag, u
uchar
*
after_key
=
rt_PAGE_NEXT_KEY
(
k
,
k_len
,
nod_flag
);
uchar
*
after_key
=
rt_PAGE_NEXT_KEY
(
k
,
k_len
,
nod_flag
);
info
->
lastpos
=
_mi_dpos
(
info
,
0
,
after_key
);
info
->
lastpos
=
_mi_dpos
(
info
,
0
,
after_key
);
info
->
lastkey_length
=
k_len
+
info
->
s
->
base
.
rec_reflength
;
info
->
lastkey_length
=
k_len
+
info
->
s
->
base
.
rec_reflength
;
memcpy
(
info
->
lastkey
,
k
,
k_len
+
info
->
s
->
base
.
rec_ref
length
);
memcpy
(
info
->
lastkey
,
k
,
info
->
lastkey_
length
);
info
->
rtree_recursion_depth
=
level
;
info
->
rtree_recursion_depth
=
level
;
*
saved_key
=
k
-
page_buf
;
*
saved_key
=
k
-
page_buf
;
...
@@ -205,7 +205,7 @@ int rtree_find_next(MI_INFO *info, uint keynr, uint search_flag)
...
@@ -205,7 +205,7 @@ int rtree_find_next(MI_INFO *info, uint keynr, uint search_flag)
info
->
lastpos
=
_mi_dpos
(
info
,
0
,
after_key
);
info
->
lastpos
=
_mi_dpos
(
info
,
0
,
after_key
);
info
->
lastkey_length
=
k_len
+
info
->
s
->
base
.
rec_reflength
;
info
->
lastkey_length
=
k_len
+
info
->
s
->
base
.
rec_reflength
;
memcpy
(
info
->
lastkey
,
key
,
k_len
+
info
->
s
->
base
.
rec_ref
length
);
memcpy
(
info
->
lastkey
,
key
,
info
->
lastkey_
length
);
*
(
int
*
)
info
->
int_keypos
=
key
-
info
->
buff
;
*
(
int
*
)
info
->
int_keypos
=
key
-
info
->
buff
;
if
(
after_key
>=
info
->
int_maxpos
)
if
(
after_key
>=
info
->
int_maxpos
)
...
@@ -246,7 +246,7 @@ static int rtree_get_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint key_length,
...
@@ -246,7 +246,7 @@ static int rtree_get_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint key_length,
int
res
;
int
res
;
uchar
*
page_buf
;
uchar
*
page_buf
;
uint
k_len
;
uint
k_len
;
int
*
saved_key
=
(
int
*
)(
info
->
rtree_recursion_state
+
level
*
sizeof
(
int
))
;
uint
*
saved_key
=
(
uint
*
)
(
info
->
rtree_recursion_state
)
+
level
;
if
(
!
(
page_buf
=
(
uchar
*
)
my_alloca
((
uint
)
keyinfo
->
block_length
)))
if
(
!
(
page_buf
=
(
uchar
*
)
my_alloca
((
uint
)
keyinfo
->
block_length
)))
return
-
1
;
return
-
1
;
...
@@ -297,7 +297,7 @@ static int rtree_get_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint key_length,
...
@@ -297,7 +297,7 @@ static int rtree_get_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint key_length,
uchar
*
after_key
=
rt_PAGE_NEXT_KEY
(
k
,
k_len
,
nod_flag
);
uchar
*
after_key
=
rt_PAGE_NEXT_KEY
(
k
,
k_len
,
nod_flag
);
info
->
lastpos
=
_mi_dpos
(
info
,
0
,
after_key
);
info
->
lastpos
=
_mi_dpos
(
info
,
0
,
after_key
);
info
->
lastkey_length
=
k_len
+
info
->
s
->
base
.
rec_reflength
;
info
->
lastkey_length
=
k_len
+
info
->
s
->
base
.
rec_reflength
;
memcpy
(
info
->
lastkey
,
k
,
k_len
+
info
->
s
->
base
.
rec_ref
length
);
memcpy
(
info
->
lastkey
,
k
,
info
->
lastkey_
length
);
info
->
rtree_recursion_depth
=
level
;
info
->
rtree_recursion_depth
=
level
;
*
saved_key
=
k
-
page_buf
;
*
saved_key
=
k
-
page_buf
;
...
...
myisam/rt_key.c
View file @
23544ee8
...
@@ -88,23 +88,10 @@ int rtree_delete_key(MI_INFO *info, uchar *page_buf, uchar *key,
...
@@ -88,23 +88,10 @@ int rtree_delete_key(MI_INFO *info, uchar *page_buf, uchar *key,
int
rtree_set_key_mbr
(
MI_INFO
*
info
,
MI_KEYDEF
*
keyinfo
,
uchar
*
key
,
int
rtree_set_key_mbr
(
MI_INFO
*
info
,
MI_KEYDEF
*
keyinfo
,
uchar
*
key
,
uint
key_length
,
my_off_t
child_page
)
uint
key_length
,
my_off_t
child_page
)
{
{
uchar
*
k
;
uchar
*
last
;
uint
nod_flag
;
if
(
!
_mi_fetch_keypage
(
info
,
keyinfo
,
child_page
,
info
->
buff
,
0
))
if
(
!
_mi_fetch_keypage
(
info
,
keyinfo
,
child_page
,
info
->
buff
,
0
))
goto
err1
;
return
-
1
;
nod_flag
=
mi_test_if_nod
(
info
->
buff
);
k
=
rt_PAGE_FIRST_KEY
(
info
->
buff
,
nod_flag
);
last
=
rt_PAGE_END
(
info
->
buff
);
rtree_page_mbr
(
info
,
keyinfo
->
seg
,
info
->
buff
,
key
,
key_length
);
return
0
;
err1:
return
rtree_page_mbr
(
info
,
keyinfo
->
seg
,
info
->
buff
,
key
,
key_length
);
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