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
4c6c69ad
Commit
4c6c69ad
authored
Dec 12, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents
30401629
5a6e23bc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+2
-1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+6
-2
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
+1
-1
No files found.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
View file @
4c6c69ad
...
@@ -784,7 +784,8 @@ int Dbtup::updateAttributes(KeyReqStruct *req_struct,
...
@@ -784,7 +784,8 @@ int Dbtup::updateAttributes(KeyReqStruct *req_struct,
req_struct
->
m_tuple_ptr
->
m_header_bits
|=
Tuple_header
::
DISK_PART
;
req_struct
->
m_tuple_ptr
->
m_header_bits
|=
Tuple_header
::
DISK_PART
;
memcpy
(
req_struct
->
m_tuple_ptr
->
get_disk_ref_ptr
(
regTabPtr
),
memcpy
(
req_struct
->
m_tuple_ptr
->
get_disk_ref_ptr
(
regTabPtr
),
inBuffer
+
inBufIndex
+
1
,
sz
<<
2
);
inBuffer
+
inBufIndex
+
1
,
sz
<<
2
);
req_struct
->
in_buf_index
=
inBufIndex
+=
1
+
sz
;
inBufIndex
+=
1
+
sz
;
req_struct
->
in_buf_index
=
inBufIndex
;
}
}
else
else
{
{
...
...
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @
4c6c69ad
...
@@ -2302,7 +2302,7 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
...
@@ -2302,7 +2302,7 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
}
}
// blob tables - use "t2" to get values set by kernel
// blob tables - use "t2" to get values set by kernel
if
(
t2
->
m_noOfBlobs
!=
0
&&
createBlobTables
(
*
t2
)
!=
0
)
{
if
(
t2
->
m_noOfBlobs
!=
0
&&
createBlobTables
(
t
,
*
t2
)
!=
0
)
{
int
save_code
=
m_error
.
code
;
int
save_code
=
m_error
.
code
;
(
void
)
dropTableGlobal
(
*
t2
);
(
void
)
dropTableGlobal
(
*
t2
);
m_error
.
code
=
save_code
;
m_error
.
code
=
save_code
;
...
@@ -2316,7 +2316,7 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
...
@@ -2316,7 +2316,7 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
}
}
int
int
NdbDictionaryImpl
::
createBlobTables
(
NdbTableImpl
&
t
)
NdbDictionaryImpl
::
createBlobTables
(
NdbTableImpl
&
orig
,
NdbTableImpl
&
t
)
{
{
DBUG_ENTER
(
"NdbDictionaryImpl::createBlobTables"
);
DBUG_ENTER
(
"NdbDictionaryImpl::createBlobTables"
);
for
(
unsigned
i
=
0
;
i
<
t
.
m_columns
.
size
();
i
++
)
{
for
(
unsigned
i
=
0
;
i
<
t
.
m_columns
.
size
();
i
++
)
{
...
@@ -2325,6 +2325,10 @@ NdbDictionaryImpl::createBlobTables(NdbTableImpl &t)
...
@@ -2325,6 +2325,10 @@ NdbDictionaryImpl::createBlobTables(NdbTableImpl &t)
continue
;
continue
;
NdbTableImpl
bt
;
NdbTableImpl
bt
;
NdbBlob
::
getBlobTable
(
bt
,
&
t
,
&
c
);
NdbBlob
::
getBlobTable
(
bt
,
&
t
,
&
c
);
NdbDictionary
::
Column
::
StorageType
d
=
NdbDictionary
::
Column
::
StorageTypeDisk
;
if
(
orig
.
m_columns
[
i
]
->
getStorageType
()
==
d
)
bt
.
getColumn
(
"DATA"
)
->
setStorageType
(
d
);
if
(
createTable
(
bt
)
!=
0
)
{
if
(
createTable
(
bt
)
!=
0
)
{
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
...
...
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
View file @
4c6c69ad
...
@@ -582,7 +582,7 @@ public:
...
@@ -582,7 +582,7 @@ public:
bool
setTransporter
(
class
TransporterFacade
*
tf
);
bool
setTransporter
(
class
TransporterFacade
*
tf
);
int
createTable
(
NdbTableImpl
&
t
);
int
createTable
(
NdbTableImpl
&
t
);
int
createBlobTables
(
NdbTableImpl
&
t
);
int
createBlobTables
(
NdbTableImpl
&
org
,
NdbTableImpl
&
created
);
int
alterTable
(
NdbTableImpl
&
t
);
int
alterTable
(
NdbTableImpl
&
t
);
int
dropTable
(
const
char
*
name
);
int
dropTable
(
const
char
*
name
);
int
dropTable
(
NdbTableImpl
&
);
int
dropTable
(
NdbTableImpl
&
);
...
...
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