mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compile warnings on Solaris

Browse source
This commit is contained in:
Monty 2015-11-20 10:00:06 +02:00
parent 981b474753
commit 1e156e1436
6 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugin/example_key_management/example_key_management_plugin.cc
View file

@ -36,24 +36,25 @@
#define KEY_ROTATION_MAX 90
static struct my_rnd_struct seed;
static unsigned int key_version = 0;
static unsigned int next_key_version = 0;
static time_t key_version = 0;
static time_t next_key_version = 0;
static pthread_mutex_t mutex;
static unsigned int
get_latest_key_version(unsigned int key_id)
{
uint now = time(0);
time_t now = time(0);
pthread_mutex_lock(&mutex);
if (now >= next_key_version)
{
key_version = now;
unsigned int interval = KEY_ROTATION_MAX - KEY_ROTATION_MIN;
next_key_version = now + KEY_ROTATION_MIN + my_rnd(&seed) * interval;
next_key_version = (time_t) (now + KEY_ROTATION_MIN +
my_rnd(&seed) * interval);
}
pthread_mutex_unlock(&mutex);
return key_version;
return (unsigned int) key_version;
}
static unsigned int

2
sql/mdl.cc
View file

@ -2036,7 +2036,7 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout)
find_deadlock();
struct timespec abs_timeout, abs_shortwait;
set_timespec(abs_timeout, lock_wait_timeout);
set_timespec(abs_timeout, (ulonglong) lock_wait_timeout);
set_timespec(abs_shortwait, 1);
wait_status= MDL_wait::EMPTY;

2
sql/sql_acl.cc
View file

@ -12526,7 +12526,7 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len)
thd->variables.max_statement_time_double=
acl_user->user_resource.max_statement_time;
thd->variables.max_statement_time=
(thd->variables.max_statement_time_double * 1e6 + 0.1);
(ulonglong) (thd->variables.max_statement_time_double * 1e6 + 0.1);
}
}
else

10
sql/sql_analyze_stmt.cc
View file

@ -39,7 +39,7 @@ void Filesort_tracker::print_json_members(Json_writer *writer)
if (r_limit == 0)
writer->add_str(varied_str);
else
writer->add_ll(rint(r_limit/get_r_loops()));
writer->add_ll((longlong) rint(r_limit/get_r_loops()));
}
writer->add_member("r_used_priority_queue");
@ -50,13 +50,13 @@ void Filesort_tracker::print_json_members(Json_writer *writer)
else
writer->add_str(varied_str);
writer->add_member("r_output_rows").add_ll(rint(r_output_rows /
get_r_loops()));
writer->add_member("r_output_rows").add_ll((longlong) rint(r_output_rows /
get_r_loops()));
if (sort_passes)
{
writer->add_member("r_sort_passes").add_ll(rint(sort_passes /
get_r_loops()));
writer->add_member("r_sort_passes").add_ll((longlong) rint(sort_passes /
get_r_loops()));
}
if (sort_buffer_size != 0)

4
sql/sql_explain.cc
View file

@ -1122,7 +1122,7 @@ void Explain_index_use::set_pseudo_key(MEM_ROOT *root, const char* key_name_arg)
}
else
key_name= NULL;
key_len= -1;
key_len= ~(uint) 0;
}
@ -2252,7 +2252,7 @@ void Explain_update::print_explain_json(Explain_query *query,
if (is_using_filesort())
{
if (filesort_tracker->get_r_loops())
r_rows= filesort_tracker->get_avg_examined_rows();
r_rows= (ha_rows) filesort_tracker->get_avg_examined_rows();
else
r_rows= 0;
r_filtered= filesort_tracker->get_r_filtered() * 100.0;

2
sql/sql_select.cc
View file

@ -25388,7 +25388,7 @@ static bool get_range_limit_read_cost(const JOIN_TAB *tab,
if (kp == table->quick_key_parts[keynr])
ref_rows= table->quick_rows[keynr];
else
ref_rows= table->key_info[keynr].actual_rec_per_key(kp-1);
ref_rows= (ha_rows) table->key_info[keynr].actual_rec_per_key(kp-1);
if (ref_rows > 0)
{