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
81766b9a
Commit
81766b9a
authored
Oct 14, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
parents
08bf55c7
e2cd597d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
14 deletions
+16
-14
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+16
-14
No files found.
sql/ha_ndbcluster.cc
View file @
81766b9a
...
...
@@ -3177,7 +3177,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
{
PRINT_OPTION_FLAGS
(
thd
);
if
(
!
(
thd
->
options
&
(
OPTION_NOT_AUTOCOMMIT
|
OPTION_BEGIN
|
OPTION_TABLE_LOCK
)))
if
(
!
(
thd
->
options
&
(
OPTION_NOT_AUTOCOMMIT
|
OPTION_BEGIN
)))
{
// Autocommit transaction
DBUG_ASSERT
(
!
thd
->
transaction
.
stmt
.
ndb_tid
);
...
...
@@ -3328,11 +3328,11 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
}
/*
When using LOCK TABLE's external_lock is only called when the actual
TABLE LOCK is done.
Under LOCK TABLES, each used tables will force a call to start_stmt.
Ndb doesn't currently support table locks, and will do ordinary
s
tartTransaction for each transaction/statement.
Start a transaction for running a statement if one is not
already running in a transaction. This will be the case in
a BEGIN; COMMIT; block
When using LOCK TABLE's external_lock will start a transaction
s
ince ndb does not currently does not support table locking
*/
int
ha_ndbcluster
::
start_stmt
(
THD
*
thd
)
...
...
@@ -3341,16 +3341,13 @@ int ha_ndbcluster::start_stmt(THD *thd)
DBUG_ENTER
(
"start_stmt"
);
PRINT_OPTION_FLAGS
(
thd
);
NdbConnection
*
trans
=
(
NdbConnection
*
)
thd
->
transaction
.
stmt
.
ndb_tid
;
NdbConnection
*
trans
=
(
thd
->
transaction
.
stmt
.
ndb_tid
)
?
(
NdbConnection
*
)(
thd
->
transaction
.
stmt
.
ndb_tid
)
:
(
NdbConnection
*
)(
thd
->
transaction
.
all
.
ndb_tid
);
if
(
!
trans
){
Ndb
*
ndb
=
((
Thd_ndb
*
)
thd
->
transaction
.
thd_ndb
)
->
ndb
;
DBUG_PRINT
(
"trans"
,(
"Starting transaction stmt"
));
NdbConnection
*
tablock_trans
=
(
NdbConnection
*
)
thd
->
transaction
.
all
.
ndb_tid
;
DBUG_PRINT
(
"info"
,
(
"tablock_trans: %x"
,
(
UintPtr
)
tablock_trans
));
DBUG_ASSERT
(
tablock_trans
);
// trans= ndb->hupp(tablock_trans);
trans
=
ndb
->
startTransaction
();
if
(
trans
==
NULL
)
ERR_RETURN
(
ndb
->
getNdbError
());
...
...
@@ -4041,7 +4038,12 @@ longlong ha_ndbcluster::get_auto_increment()
--
retries
&&
ndb
->
getNdbError
().
status
==
NdbError
::
TemporaryError
);
if
(
auto_value
==
NDB_FAILED_AUTO_INCREMENT
)
ERR_RETURN
(
ndb
->
getNdbError
());
{
const
NdbError
err
=
ndb
->
getNdbError
();
sql_print_error
(
"Error %lu in ::get_auto_increment(): %s"
,
(
ulong
)
err
.
code
,
err
.
message
);
DBUG_RETURN
(
~
(
ulonglong
)
0
);
}
DBUG_RETURN
((
longlong
)
auto_value
);
}
...
...
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