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
73d382f6
Commit
73d382f6
authored
Sep 20, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
parents
d800227f
ba55d19f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
mysys/default.c
mysys/default.c
+1
-1
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+13
-2
No files found.
mysys/default.c
View file @
73d382f6
...
...
@@ -138,7 +138,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
defaults_group_suffix
=
getenv
(
STRINGIFY_ARG
(
DEFAULT_GROUP_SUFFIX_ENV
));
if
(
forced_extra_defaults
)
defaults_extra_file
=
forced_extra_defaults
;
defaults_extra_file
=
(
char
*
)
forced_extra_defaults
;
/*
We can only handle 'defaults-group-suffix' if we are called from
...
...
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
View file @
73d382f6
...
...
@@ -1004,8 +1004,19 @@ Dbtup::read_psuedo(Uint32 attrId, Uint32* outBuffer){
return
1
;
case
AttributeHeader
:
:
FRAGMENT_MEMORY
:
{
Uint64
tmp
=
fragptr
.
p
->
noOfPages
;
tmp
*=
32768
;
Uint64
tmp
=
0
;
tmp
+=
fragptr
.
p
->
noOfPages
;
{
/**
* Each fragment is split into 2...get #pages from other as well
*/
Uint32
twin
=
fragptr
.
p
->
fragmentId
^
1
;
FragrecordPtr
twinPtr
;
getFragmentrec
(
twinPtr
,
twin
,
tabptr
.
p
);
ndbrequire
(
twinPtr
.
p
!=
0
);
tmp
+=
twinPtr
.
p
->
noOfPages
;
}
tmp
*=
32768
;
memcpy
(
outBuffer
,
&
tmp
,
8
);
}
return
2
;
...
...
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