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
70a7e97e
Commit
70a7e97e
authored
Feb 19, 2011
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed high-impact Windows 64bit warnings (at least 4000 of them)
parent
28cb3b85
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
sql/sql_class.h
sql/sql_class.h
+1
-1
sql/sql_join_cache.cc
sql/sql_join_cache.cc
+1
-1
sql/sql_join_cache.h
sql/sql_join_cache.h
+3
-3
sql/sql_lifo_buffer.h
sql/sql_lifo_buffer.h
+2
-2
sql/sql_select.cc
sql/sql_select.cc
+1
-1
sql/sql_string.h
sql/sql_string.h
+1
-1
No files found.
sql/sql_class.h
View file @
70a7e97e
...
@@ -768,7 +768,7 @@ public:
...
@@ -768,7 +768,7 @@ public:
Server_side_cursor
*
cursor
;
Server_side_cursor
*
cursor
;
inline
char
*
query
()
{
return
query_string
.
str
;
}
inline
char
*
query
()
{
return
query_string
.
str
;
}
inline
uint32
query_length
()
{
return
query_string
.
length
;
}
inline
uint32
query_length
()
{
return
(
uint32
)
query_string
.
length
;
}
void
set_query_inner
(
char
*
query_arg
,
uint32
query_length_arg
);
void
set_query_inner
(
char
*
query_arg
,
uint32
query_length_arg
);
/**
/**
...
...
sql/sql_join_cache.cc
View file @
70a7e97e
...
@@ -1230,7 +1230,7 @@ uint JOIN_CACHE::write_record_data(uchar * link, bool *is_full)
...
@@ -1230,7 +1230,7 @@ uint JOIN_CACHE::write_record_data(uchar * link, bool *is_full)
/* Make an adjustment for the size of the auxiliary buffer if there is any */
/* Make an adjustment for the size of the auxiliary buffer if there is any */
uint
incr
=
aux_buffer_incr
(
records
);
uint
incr
=
aux_buffer_incr
(
records
);
ulong
rem
=
rem_space
();
size_t
rem
=
rem_space
();
aux_buff_size
+=
len
+
incr
<
rem
?
incr
:
rem
;
aux_buff_size
+=
len
+
incr
<
rem
?
incr
:
rem
;
/*
/*
...
...
sql/sql_join_cache.h
View file @
70a7e97e
...
@@ -398,7 +398,7 @@ protected:
...
@@ -398,7 +398,7 @@ protected:
virtual
uint
aux_buffer_incr
(
ulong
recno
);
virtual
uint
aux_buffer_incr
(
ulong
recno
);
/* Shall calculate how much space is remaining in the join buffer */
/* Shall calculate how much space is remaining in the join buffer */
virtual
ulong
rem_space
()
virtual
size_t
rem_space
()
{
{
return
max
(
buff_size
-
(
end_pos
-
buff
)
-
aux_buff_size
,
0
);
return
max
(
buff_size
-
(
end_pos
-
buff
)
-
aux_buff_size
,
0
);
}
}
...
@@ -576,7 +576,7 @@ public:
...
@@ -576,7 +576,7 @@ public:
virtual
int
init
();
virtual
int
init
();
/* Get the current size of the cache join buffer */
/* Get the current size of the cache join buffer */
ulong
get_join_buffer_size
()
{
return
buff_size
;
}
size_t
get_join_buffer_size
()
{
return
buff_size
;
}
/* Set the size of the cache join buffer to a new value */
/* Set the size of the cache join buffer to a new value */
void
set_join_buffer_size
(
size_t
sz
)
{
buff_size
=
sz
;
}
void
set_join_buffer_size
(
size_t
sz
)
{
buff_size
=
sz
;
}
...
@@ -921,7 +921,7 @@ protected:
...
@@ -921,7 +921,7 @@ protected:
Calculate how much space in the buffer would not be occupied by
Calculate how much space in the buffer would not be occupied by
records, key entries and additional memory for the MMR buffer.
records, key entries and additional memory for the MMR buffer.
*/
*/
ulong
rem_space
()
size_t
rem_space
()
{
{
return
max
(
last_key_entry
-
end_pos
-
aux_buff_size
,
0
);
return
max
(
last_key_entry
-
end_pos
-
aux_buff_size
,
0
);
}
}
...
...
sql/sql_lifo_buffer.h
View file @
70a7e97e
...
@@ -102,8 +102,8 @@ public:
...
@@ -102,8 +102,8 @@ public:
void
sort
(
qsort2_cmp
cmp_func
,
void
*
cmp_func_arg
)
void
sort
(
qsort2_cmp
cmp_func
,
void
*
cmp_func_arg
)
{
{
uin
t
elem_size
=
size1
+
size2
;
size_
t
elem_size
=
size1
+
size2
;
uin
t
n_elements
=
used_size
()
/
elem_size
;
size_
t
n_elements
=
used_size
()
/
elem_size
;
my_qsort2
(
used_area
(),
n_elements
,
elem_size
,
cmp_func
,
cmp_func_arg
);
my_qsort2
(
used_area
(),
n_elements
,
elem_size
,
cmp_func
,
cmp_func_arg
);
}
}
...
...
sql/sql_select.cc
View file @
70a7e97e
...
@@ -1706,7 +1706,7 @@ bool JOIN::shrink_join_buffers(JOIN_TAB *jt,
...
@@ -1706,7 +1706,7 @@ bool JOIN::shrink_join_buffers(JOIN_TAB *jt,
cache
=
tab
->
cache
;
cache
=
tab
->
cache
;
if
(
cache
)
if
(
cache
)
{
{
ulong
buff_size
;
size_t
buff_size
;
if
(
needed_space
<
cache
->
get_min_join_buffer_size
())
if
(
needed_space
<
cache
->
get_min_join_buffer_size
())
return
TRUE
;
return
TRUE
;
if
(
cache
->
shrink_join_buffer_in_ratio
(
curr_space
,
needed_space
))
if
(
cache
->
shrink_join_buffer_in_ratio
(
curr_space
,
needed_space
))
...
...
sql/sql_string.h
View file @
70a7e97e
...
@@ -363,7 +363,7 @@ public:
...
@@ -363,7 +363,7 @@ public:
void
qs_append
(
const
char
*
str
)
void
qs_append
(
const
char
*
str
)
{
{
qs_append
(
str
,
strlen
(
str
));
qs_append
(
str
,
(
uint32
)
strlen
(
str
));
}
}
void
qs_append
(
const
char
*
str
,
uint32
len
);
void
qs_append
(
const
char
*
str
,
uint32
len
);
void
qs_append
(
double
d
);
void
qs_append
(
double
d
);
...
...
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