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
164b4696
Commit
164b4696
authored
Nov 02, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed wrong merge
Optimize new pushed code
parent
438e8b6d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
sql/item_func.cc
sql/item_func.cc
+0
-1
sql/sql_update.cc
sql/sql_update.cc
+3
-4
No files found.
sql/item_func.cc
View file @
164b4696
...
...
@@ -1378,7 +1378,6 @@ my_decimal *Item_func_abs::decimal_op(my_decimal *decimal_value)
void
Item_func_abs
::
fix_length_and_dec
()
{
Item_func_num1
::
fix_length_and_dec
();
maybe_null
=
1
;
}
...
...
sql/sql_update.cc
View file @
164b4696
...
...
@@ -121,7 +121,7 @@ int mysql_update(THD *thd,
bool
safe_update
=
thd
->
options
&
OPTION_SAFE_UPDATES
;
bool
used_key_is_modified
,
transactional_table
;
int
res
;
int
error
=
0
;
int
error
;
uint
used_index
=
MAX_KEY
;
bool
need_sort
=
TRUE
;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
...
...
@@ -132,7 +132,7 @@ int mysql_update(THD *thd,
ha_rows
updated
,
found
;
key_map
old_used_keys
;
TABLE
*
table
;
SQL_SELECT
*
select
=
0
;
SQL_SELECT
*
select
;
READ_RECORD
info
;
SELECT_LEX
*
select_lex
=
&
thd
->
lex
->
select_lex
;
bool
need_reopen
;
...
...
@@ -237,8 +237,7 @@ int mysql_update(THD *thd,
}
// Don't count on usage of 'only index' when calculating which key to use
table
->
used_keys
.
clear_all
();
if
(
limit
)
select
=
make_select
(
table
,
0
,
0
,
conds
,
0
,
&
error
);
select
=
make_select
(
table
,
0
,
0
,
conds
,
0
,
&
error
);
if
(
error
||
!
limit
||
(
select
&&
select
->
check_quick
(
thd
,
safe_update
,
limit
)))
{
...
...
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