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
37b8c961
Commit
37b8c961
authored
Mar 21, 2007
by
tomas@whalegate.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents
ac8592ce
5682efdf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+7
-4
No files found.
sql/ha_ndbcluster.cc
View file @
37b8c961
...
@@ -952,7 +952,7 @@ int ha_ndbcluster::get_metadata(const char *path)
...
@@ -952,7 +952,7 @@ int ha_ndbcluster::get_metadata(const char *path)
DBUG_PRINT
(
"enter"
,
(
"m_tabname: %s, path: %s"
,
m_tabname
,
path
));
DBUG_PRINT
(
"enter"
,
(
"m_tabname: %s, path: %s"
,
m_tabname
,
path
));
do
{
do
{
const
void
*
data
,
*
pack_data
;
const
void
*
data
=
NULL
,
*
pack_data
=
NULL
;
uint
length
,
pack_length
;
uint
length
,
pack_length
;
if
(
!
(
tab
=
dict
->
getTable
(
m_tabname
)))
if
(
!
(
tab
=
dict
->
getTable
(
m_tabname
)))
...
@@ -3751,7 +3751,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
...
@@ -3751,7 +3751,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
if
((
my_errno
=
build_index_list
(
ndb
,
table
,
ILBP_OPEN
)))
if
((
my_errno
=
build_index_list
(
ndb
,
table
,
ILBP_OPEN
)))
DBUG_RETURN
(
my_errno
);
DBUG_RETURN
(
my_errno
);
const
void
*
data
,
*
pack_data
;
const
void
*
data
=
NULL
,
*
pack_data
=
NULL
;
uint
length
,
pack_length
;
uint
length
,
pack_length
;
if
(
readfrm
(
table
->
s
->
path
,
&
data
,
&
length
)
||
if
(
readfrm
(
table
->
s
->
path
,
&
data
,
&
length
)
||
packfrm
(
data
,
length
,
&
pack_data
,
&
pack_length
)
||
packfrm
(
data
,
length
,
&
pack_data
,
&
pack_length
)
||
...
@@ -4340,7 +4340,7 @@ int ha_ndbcluster::create(const char *name,
...
@@ -4340,7 +4340,7 @@ int ha_ndbcluster::create(const char *name,
NDBTAB
tab
;
NDBTAB
tab
;
NDBCOL
col
;
NDBCOL
col
;
uint
pack_length
,
length
,
i
,
pk_length
=
0
;
uint
pack_length
,
length
,
i
,
pk_length
=
0
;
const
void
*
data
,
*
pack_data
;
const
void
*
data
=
NULL
,
*
pack_data
=
NULL
;
char
name2
[
FN_HEADLEN
];
char
name2
[
FN_HEADLEN
];
bool
create_from_engine
=
(
create_info
->
table_options
&
HA_OPTION_CREATE_FROM_ENGINE
);
bool
create_from_engine
=
(
create_info
->
table_options
&
HA_OPTION_CREATE_FROM_ENGINE
);
...
@@ -4375,8 +4375,11 @@ int ha_ndbcluster::create(const char *name,
...
@@ -4375,8 +4375,11 @@ int ha_ndbcluster::create(const char *name,
if
(
readfrm
(
name
,
&
data
,
&
length
))
if
(
readfrm
(
name
,
&
data
,
&
length
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
if
(
packfrm
(
data
,
length
,
&
pack_data
,
&
pack_length
))
if
(
packfrm
(
data
,
length
,
&
pack_data
,
&
pack_length
))
{
my_free
((
char
*
)
data
,
MYF
(
0
));
DBUG_RETURN
(
2
);
DBUG_RETURN
(
2
);
}
DBUG_PRINT
(
"info"
,
(
"setFrm data: 0x%lx len: %d"
,
(
long
)
pack_data
,
pack_length
));
DBUG_PRINT
(
"info"
,
(
"setFrm data: 0x%lx len: %d"
,
(
long
)
pack_data
,
pack_length
));
tab
.
setFrm
(
pack_data
,
pack_length
);
tab
.
setFrm
(
pack_data
,
pack_length
);
my_free
((
char
*
)
data
,
MYF
(
0
));
my_free
((
char
*
)
data
,
MYF
(
0
));
...
...
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