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
9c914957
Commit
9c914957
authored
Mar 31, 2005
by
magnus@msdesk.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into msdesk.mysql.com:/home/magnus/mysql-5.0
parents
830b088f
e8434aad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-2
No files found.
BitKeeper/etc/logging_ok
View file @
9c914957
...
@@ -120,6 +120,7 @@ kostja@oak.local
...
@@ -120,6 +120,7 @@ kostja@oak.local
lars@mysql.com
lars@mysql.com
lenz@kallisto.mysql.com
lenz@kallisto.mysql.com
lenz@mysql.com
lenz@mysql.com
magnus@msdesk.mysql.com
magnus@neptunus.(none)
magnus@neptunus.(none)
magnus@shellback.(none)
magnus@shellback.(none)
marko@hundin.mysql.fi
marko@hundin.mysql.fi
...
...
sql/ha_ndbcluster.cc
View file @
9c914957
...
@@ -2171,6 +2171,7 @@ int ha_ndbcluster::delete_row(const byte *record)
...
@@ -2171,6 +2171,7 @@ int ha_ndbcluster::delete_row(const byte *record)
DBUG_ENTER
(
"delete_row"
);
DBUG_ENTER
(
"delete_row"
);
statistic_increment
(
thd
->
status_var
.
ha_delete_count
,
&
LOCK_status
);
statistic_increment
(
thd
->
status_var
.
ha_delete_count
,
&
LOCK_status
);
m_rows_changed
++
;
if
(
cursor
)
if
(
cursor
)
{
{
...
@@ -2221,8 +2222,6 @@ int ha_ndbcluster::delete_row(const byte *record)
...
@@ -2221,8 +2222,6 @@ int ha_ndbcluster::delete_row(const byte *record)
}
}
}
}
m_rows_changed
++
;
// Execute delete operation
// Execute delete operation
if
(
execute_no_commit
(
this
,
trans
)
!=
0
)
{
if
(
execute_no_commit
(
this
,
trans
)
!=
0
)
{
no_uncommitted_rows_execute_failure
();
no_uncommitted_rows_execute_failure
();
...
...
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