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
ed2674d0
Commit
ed2674d0
authored
Nov 17, 2004
by
konstantin@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings and compilation failures (Windows).
parent
0fa5496a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
9 deletions
+8
-9
sql/field.cc
sql/field.cc
+1
-3
sql/item_func.cc
sql/item_func.cc
+1
-1
sql/opt_range.cc
sql/opt_range.cc
+4
-3
sql/sp_pcontext.h
sql/sp_pcontext.h
+1
-1
sql/table.h
sql/table.h
+1
-1
No files found.
sql/field.cc
View file @
ed2674d0
...
@@ -1785,7 +1785,6 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
...
@@ -1785,7 +1785,6 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
longlong
tmp
;
longlong
tmp
;
long
store_tmp
;
long
store_tmp
;
int
error
;
int
error
;
bool
warning_given
=
0
;
char
*
end
;
char
*
end
;
tmp
=
cs
->
cset
->
scan
(
cs
,
from
,
from
+
len
,
MY_SEQ_SPACES
);
tmp
=
cs
->
cset
->
scan
(
cs
,
from
,
from
+
len
,
MY_SEQ_SPACES
);
...
@@ -2075,8 +2074,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
...
@@ -2075,8 +2074,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
longlong
tmp
;
longlong
tmp
;
int
error
=
0
;
int
error
=
0
;
char
*
end
;
char
*
end
;
bool
warning_given
;
tmp
=
cs
->
cset
->
scan
(
cs
,
from
,
from
+
len
,
MY_SEQ_SPACES
);
tmp
=
cs
->
cset
->
scan
(
cs
,
from
,
from
+
len
,
MY_SEQ_SPACES
);
len
-=
(
uint
)
tmp
;
len
-=
(
uint
)
tmp
;
from
+=
tmp
;
from
+=
tmp
;
...
...
sql/item_func.cc
View file @
ed2674d0
...
@@ -174,7 +174,7 @@ bool Item_func::agg_arg_charsets(DTCollation &coll,
...
@@ -174,7 +174,7 @@ bool Item_func::agg_arg_charsets(DTCollation &coll,
for
(
arg
=
args
,
last
=
args
+
nargs
;
arg
<
last
;
arg
++
)
for
(
arg
=
args
,
last
=
args
+
nargs
;
arg
<
last
;
arg
++
)
{
{
Item
*
conv
;
Item
*
conv
;
uint
dummy_offset
;
uint
32
dummy_offset
;
if
(
!
String
::
needs_conversion
(
0
,
coll
.
collation
,
if
(
!
String
::
needs_conversion
(
0
,
coll
.
collation
,
(
*
arg
)
->
collation
.
collation
,
(
*
arg
)
->
collation
.
collation
,
&
dummy_offset
))
&
dummy_offset
))
...
...
sql/opt_range.cc
View file @
ed2674d0
...
@@ -5533,7 +5533,6 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
...
@@ -5533,7 +5533,6 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
goto
err
;
goto
err
;
}
}
ok:
thd
->
mem_root
=
old_root
;
thd
->
mem_root
=
old_root
;
return
quick
;
return
quick
;
...
@@ -8067,7 +8066,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
...
@@ -8067,7 +8066,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
boundary of cur_range, there is no need to check this range.
boundary of cur_range, there is no need to check this range.
*/
*/
if
(
range_idx
!=
0
&&
!
(
cur_range
->
flag
&
NO_MAX_RANGE
)
&&
if
(
range_idx
!=
0
&&
!
(
cur_range
->
flag
&
NO_MAX_RANGE
)
&&
(
key_cmp
(
min_max_arg_part
,
cur_range
->
max_key
,
min_max_arg_len
)
==
1
))
(
key_cmp
(
min_max_arg_part
,
(
byte
*
)
cur_range
->
max_key
,
min_max_arg_len
)
==
1
))
continue
;
continue
;
if
(
cur_range
->
flag
&
NO_MIN_RANGE
)
if
(
cur_range
->
flag
&
NO_MIN_RANGE
)
...
@@ -8193,7 +8193,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
...
@@ -8193,7 +8193,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
*/
*/
if
(
range_idx
!=
min_max_ranges
.
elements
&&
if
(
range_idx
!=
min_max_ranges
.
elements
&&
!
(
cur_range
->
flag
&
NO_MIN_RANGE
)
&&
!
(
cur_range
->
flag
&
NO_MIN_RANGE
)
&&
(
key_cmp
(
min_max_arg_part
,
cur_range
->
min_key
,
min_max_arg_len
)
==
-
1
))
(
key_cmp
(
min_max_arg_part
,
(
byte
*
)
cur_range
->
min_key
,
min_max_arg_len
)
==
-
1
))
continue
;
continue
;
if
(
cur_range
->
flag
&
NO_MAX_RANGE
)
if
(
cur_range
->
flag
&
NO_MAX_RANGE
)
...
...
sql/sp_pcontext.h
View file @
ed2674d0
...
@@ -50,7 +50,7 @@ typedef struct sp_label
...
@@ -50,7 +50,7 @@ typedef struct sp_label
char
*
name
;
char
*
name
;
uint
ip
;
// Instruction index
uint
ip
;
// Instruction index
int
type
;
// begin/iter or ref/free
int
type
;
// begin/iter or ref/free
s
truct
sp_pcontext
*
ctx
;
// The label's context
s
p_pcontext
*
ctx
;
// The label's context
}
sp_label_t
;
}
sp_label_t
;
typedef
struct
sp_cond_type
typedef
struct
sp_cond_type
...
...
sql/table.h
View file @
ed2674d0
...
@@ -274,7 +274,7 @@ typedef struct st_schema_table
...
@@ -274,7 +274,7 @@ typedef struct st_schema_table
#define VIEW_CHECK_SKIP 2
#define VIEW_CHECK_SKIP 2
struct
st_lex
;
struct
st_lex
;
struct
select_union
;
class
select_union
;
typedef
struct
st_table_list
typedef
struct
st_table_list
{
{
...
...
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