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
208549c9
Commit
208549c9
authored
Jul 01, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
parents
45ea95f4
c6654e63
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
sql/sql_select.cc
sql/sql_select.cc
+4
-5
No files found.
sql/sql_select.cc
View file @
208549c9
...
@@ -8222,12 +8222,10 @@ cp_buffer_from_ref(THD *thd, TABLE_REF *ref)
...
@@ -8222,12 +8222,10 @@ cp_buffer_from_ref(THD *thd, TABLE_REF *ref)
thd
->
count_cuted_fields
=
CHECK_FIELD_IGNORE
;
thd
->
count_cuted_fields
=
CHECK_FIELD_IGNORE
;
for
(
store_key
**
copy
=
ref
->
key_copy
;
*
copy
;
copy
++
)
for
(
store_key
**
copy
=
ref
->
key_copy
;
*
copy
;
copy
++
)
{
{
int
res
;
if
((
*
copy
)
->
copy
()
&
1
)
if
((
res
=
(
*
copy
)
->
copy
()))
{
{
thd
->
count_cuted_fields
=
save_count_cuted_fields
;
thd
->
count_cuted_fields
=
save_count_cuted_fields
;
if
((
res
=
res
&
1
))
return
1
;
// Something went wrong
return
res
;
// Something went wrong
}
}
}
}
thd
->
count_cuted_fields
=
save_count_cuted_fields
;
thd
->
count_cuted_fields
=
save_count_cuted_fields
;
...
@@ -8818,7 +8816,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
...
@@ -8818,7 +8816,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
err:
err:
delete
[]
param
->
copy_field
;
// This is never 0
if
(
copy
)
delete
[]
param
->
copy_field
;
param
->
copy_field
=
0
;
param
->
copy_field
=
0
;
err2:
err2:
DBUG_RETURN
(
TRUE
);
DBUG_RETURN
(
TRUE
);
...
...
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