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
f928a0c4
Commit
f928a0c4
authored
Jun 12, 2003
by
igor@rurik.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
parents
c317269d
7009100c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
mysys/mf_keycache.c
mysys/mf_keycache.c
+6
-3
No files found.
BitKeeper/etc/logging_ok
View file @
f928a0c4
...
@@ -34,6 +34,7 @@ hf@deer.(none)
...
@@ -34,6 +34,7 @@ hf@deer.(none)
hf@deer.mysql.r18.ru
hf@deer.mysql.r18.ru
hf@genie.(none)
hf@genie.(none)
igor@hundin.mysql.fi
igor@hundin.mysql.fi
igor@rurik.mysql.com
jani@dsl-jkl1657.dial.inet.fi
jani@dsl-jkl1657.dial.inet.fi
jani@dsl-kpogw4gb5.dial.inet.fi
jani@dsl-kpogw4gb5.dial.inet.fi
jani@hynda.(none)
jani@hynda.(none)
...
...
mysys/mf_keycache.c
View file @
f928a0c4
...
@@ -826,7 +826,7 @@ restart:
...
@@ -826,7 +826,7 @@ restart:
(
uint
)
hash_link
->
file
,(
ulong
)
hash_link
->
diskpos
));
(
uint
)
hash_link
->
file
,(
ulong
)
hash_link
->
diskpos
));
}
}
}
}
KEYCACHE_DBUG_ASSERT
(
n
<=
my_hash_links_used
);
KEYCACHE_DBUG_ASSERT
(
cnt
<=
my_hash_links_used
);
#endif
#endif
}
}
if
(
!
hash_link
)
if
(
!
hash_link
)
...
@@ -1063,6 +1063,9 @@ restart:
...
@@ -1063,6 +1063,9 @@ restart:
KEYCACHE_DBUG_ASSERT
(
page_status
!=
-
1
);
KEYCACHE_DBUG_ASSERT
(
page_status
!=
-
1
);
*
page_st
=
page_status
;
*
page_st
=
page_status
;
KEYCACHE_DBUG_PRINT
(
"find_key_block"
,
(
"file %u, filepos %lu, page_status %lu"
,
(
uint
)
file
,(
ulong
)
filepos
,(
uint
)
page_status
));
#if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
#if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
DBUG_EXECUTE
(
"check_keycache2"
,
test_key_cache
(
"end of find_key_block"
,
0
););
DBUG_EXECUTE
(
"check_keycache2"
,
test_key_cache
(
"end of find_key_block"
,
0
););
...
@@ -1181,7 +1184,7 @@ byte *key_cache_read(File file, my_off_t filepos, byte *buff, uint length,
...
@@ -1181,7 +1184,7 @@ byte *key_cache_read(File file, my_off_t filepos, byte *buff, uint length,
keycache_pthread_mutex_lock
(
&
THR_LOCK_keycache
);
keycache_pthread_mutex_lock
(
&
THR_LOCK_keycache
);
my_cache_r_requests
++
;
my_cache_r_requests
++
;
block
=
find_key_block
(
file
,
filepos
,
0
,
&
page_st
);
block
=
find_key_block
(
file
,
filepos
,
0
,
&
page_st
);
if
(
page_st
!=
PAGE_READ
)
if
(
block
->
status
!=
BLOCK_ERROR
&&
page_st
!=
PAGE_READ
)
{
{
/* The requested page is to be read into the block buffer */
/* The requested page is to be read into the block buffer */
read_block
(
block
,
key_cache_block_size
,
read_length
+
offset
,
read_block
(
block
,
key_cache_block_size
,
read_length
+
offset
,
...
@@ -1303,7 +1306,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length,
...
@@ -1303,7 +1306,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length,
keycache_pthread_mutex_lock
(
&
THR_LOCK_keycache
);
keycache_pthread_mutex_lock
(
&
THR_LOCK_keycache
);
my_cache_w_requests
++
;
my_cache_w_requests
++
;
block
=
find_key_block
(
file
,
filepos
,
1
,
&
page_st
);
block
=
find_key_block
(
file
,
filepos
,
1
,
&
page_st
);
if
(
page_st
!=
PAGE_READ
&&
if
(
block
->
status
!=
BLOCK_ERROR
&&
page_st
!=
PAGE_READ
&&
(
offset
||
read_length
<
key_cache_block_size
))
(
offset
||
read_length
<
key_cache_block_size
))
read_block
(
block
,
read_block
(
block
,
offset
+
read_length
>=
key_cache_block_size
?
offset
+
read_length
>=
key_cache_block_size
?
...
...
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