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
01536189
Commit
01536189
authored
Jun 28, 2018
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ob-10.1' into 10.1
parents
546773fb
3d9d4476
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
+16
-12
storage/connect/filamvct.cpp
storage/connect/filamvct.cpp
+14
-8
storage/connect/tabvct.cpp
storage/connect/tabvct.cpp
+2
-4
No files found.
storage/connect/filamvct.cpp
View file @
01536189
...
...
@@ -515,7 +515,8 @@ bool VCTFAM::AllocateBuffer(PGLOBAL g)
for
(;
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
cp
->
Blk
=
AllocValBlock
(
g
,
NewBlock
+
Nrec
*
cp
->
Deplac
,
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
chk
);
cp
->
Format
.
Prec
,
chk
,
true
,
cp
->
IsUnsigned
());
return
InitInsert
(
g
);
// Initialize inserting
}
else
{
...
...
@@ -549,7 +550,8 @@ bool VCTFAM::AllocateBuffer(PGLOBAL g)
for
(;
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
if
(
!
cp
->
IsSpecial
())
// Not a pseudo column
cp
->
Blk
=
AllocValBlock
(
g
,
NULL
,
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
);
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
true
,
true
,
cp
->
IsUnsigned
());
}
//endif mode
...
...
@@ -1516,7 +1518,8 @@ bool VCMFAM::AllocateBuffer(PGLOBAL g)
for
(
cp
=
(
PVCTCOL
)
Tdbp
->
GetColumns
();
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
if
(
!
cp
->
IsSpecial
())
{
// Not a pseudo column
cp
->
Blk
=
AllocValBlock
(
g
,
(
void
*
)
1
,
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
);
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
true
,
true
,
cp
->
IsUnsigned
());
cp
->
AddStatus
(
BUF_MAPPED
);
}
// endif IsSpecial
...
...
@@ -2067,7 +2070,7 @@ bool VECFAM::AllocateBuffer(PGLOBAL g)
for
(
cp
=
(
PVCTCOL
)
tdbp
->
Columns
;
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
cp
->
Blk
=
AllocValBlock
(
g
,
To_Bufs
[
cp
->
Index
-
1
],
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
chk
);
cp
->
Format
.
Prec
,
chk
,
true
,
cp
->
IsUnsigned
()
);
return
InitInsert
(
g
);
}
else
{
...
...
@@ -2116,7 +2119,8 @@ bool VECFAM::AllocateBuffer(PGLOBAL g)
for
(
cp
=
(
PVCTCOL
)
tdbp
->
Columns
;
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
if
(
!
cp
->
IsSpecial
())
// Not a pseudo column
cp
->
Blk
=
AllocValBlock
(
g
,
NULL
,
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
);
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
true
,
true
,
cp
->
IsUnsigned
());
}
// endif mode
...
...
@@ -2887,7 +2891,8 @@ bool VMPFAM::AllocateBuffer(PGLOBAL g)
for
(
cp
=
(
PVCTCOL
)
Tdbp
->
GetColumns
();
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
if
(
!
cp
->
IsSpecial
())
{
// Not a pseudo column
cp
->
Blk
=
AllocValBlock
(
g
,
(
void
*
)
1
,
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
);
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
true
,
true
,
cp
->
IsUnsigned
());
cp
->
AddStatus
(
BUF_MAPPED
);
}
// endif IsSpecial
...
...
@@ -3669,7 +3674,7 @@ bool BGVFAM::AllocateBuffer(PGLOBAL g)
for
(;
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
cp
->
Blk
=
AllocValBlock
(
g
,
NewBlock
+
Nrec
*
cp
->
Deplac
,
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
chk
);
cp
->
Format
.
Prec
,
chk
,
true
,
cp
->
IsUnsigned
()
);
InitInsert
(
g
);
// Initialize inserting
...
...
@@ -3717,7 +3722,8 @@ bool BGVFAM::AllocateBuffer(PGLOBAL g)
for
(;
cp
;
cp
=
(
PVCTCOL
)
cp
->
Next
)
if
(
!
cp
->
IsSpecial
())
// Not a pseudo column
cp
->
Blk
=
AllocValBlock
(
g
,
NULL
,
cp
->
Buf_Type
,
Nrec
,
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
);
cp
->
Format
.
Length
,
cp
->
Format
.
Prec
,
true
,
true
,
cp
->
IsUnsigned
());
}
//endif mode
...
...
storage/connect/tabvct.cpp
View file @
01536189
...
...
@@ -456,13 +456,11 @@ bool VCTCOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
if
(
tdbp
->
Txfp
->
GetAmType
()
==
TYPE_AM_VMP
&&
ok
)
{
Blk
=
AllocValBlock
(
g
,
(
void
*
)
1
,
Buf_Type
,
tdbp
->
Txfp
->
Nrec
,
Format
.
Length
,
Format
.
Prec
,
check
);
Format
.
Length
,
Format
.
Prec
,
check
,
true
,
Unsigned
);
Status
|=
BUF_MAPPED
;
// Will point into mapped file
}
else
Blk
=
AllocValBlock
(
g
,
NULL
,
Buf_Type
,
tdbp
->
Txfp
->
Nrec
,
Format
.
Length
,
Format
.
Prec
,
check
);
Format
.
Length
,
Format
.
Prec
,
check
,
true
,
Unsigned
);
}
// endif Mode
return
false
;
...
...
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