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
24aa214a
Commit
24aa214a
authored
17 years ago
by
gkodinov/kgeorge@magare.gmz
Browse files
Options
Browse Files
Download
Plain Diff
Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt
parents
cfbfb8ba
500af554
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
sql/sql_update.cc
sql/sql_update.cc
+2
-1
No files found.
sql/sql_update.cc
View file @
24aa214a
...
@@ -1551,7 +1551,8 @@ multi_update::~multi_update()
...
@@ -1551,7 +1551,8 @@ multi_update::~multi_update()
if
(
copy_field
)
if
(
copy_field
)
delete
[]
copy_field
;
delete
[]
copy_field
;
thd
->
count_cuted_fields
=
CHECK_FIELD_IGNORE
;
// Restore this setting
thd
->
count_cuted_fields
=
CHECK_FIELD_IGNORE
;
// Restore this setting
DBUG_ASSERT
(
trans_safe
||
thd
->
transaction
.
all
.
modified_non_trans_table
);
DBUG_ASSERT
(
trans_safe
||
!
updated
||
thd
->
transaction
.
all
.
modified_non_trans_table
);
}
}
...
...
This diff is collapsed.
Click to expand it.
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