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
716583b6
Commit
716583b6
authored
Nov 18, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-grind
parents
5110b048
b593f4ef
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
.bzrignore
.bzrignore
+1
-0
sql/item.cc
sql/item.cc
+3
-0
sql/opt_range.cc
sql/opt_range.cc
+2
-2
No files found.
.bzrignore
View file @
716583b6
...
...
@@ -960,3 +960,4 @@ vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
ac_available_languages_fragment
ndb/tools/ndb_restore
sql/item.cc
View file @
716583b6
...
...
@@ -1722,7 +1722,10 @@ resolve_ref_in_select_and_group(THD *thd, Item_ident *ref, SELECT_LEX *select)
else
if
(
group_by_ref
)
return
group_by_ref
;
else
{
DBUG_ASSERT
(
FALSE
);
return
NULL
;
/* So there is no compiler warning. */
}
}
else
return
(
Item
**
)
not_found_item
;
...
...
sql/opt_range.cc
View file @
716583b6
...
...
@@ -8066,7 +8066,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
boundary of cur_range, there is no need to check this range.
*/
if
(
range_idx
!=
0
&&
!
(
cur_range
->
flag
&
NO_MAX_RANGE
)
&&
(
key_cmp
(
min_max_arg_part
,
(
byte
*
)
cur_range
->
max_key
,
(
key_cmp
(
min_max_arg_part
,
(
const
byte
*
)
cur_range
->
max_key
,
min_max_arg_len
)
==
1
))
continue
;
...
...
@@ -8193,7 +8193,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
*/
if
(
range_idx
!=
min_max_ranges
.
elements
&&
!
(
cur_range
->
flag
&
NO_MIN_RANGE
)
&&
(
key_cmp
(
min_max_arg_part
,
(
byte
*
)
cur_range
->
min_key
,
(
key_cmp
(
min_max_arg_part
,
(
const
byte
*
)
cur_range
->
min_key
,
min_max_arg_len
)
==
-
1
))
continue
;
...
...
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