diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-06 11:51:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-08 09:46:51 +0100 |
| commit | 99774f150186d1624efe41a6600c437e556f6299 (patch) | |
| tree | fec1d387c15302b29ea9999a675b26180016f280 | |
| parent | 8fd24b418d1a0935ff37d164a6548c9f956bf600 (diff) | |
| download | mariadb-git-99774f150186d1624efe41a6600c437e556f6299.tar.gz | |
feedback plugin compilation warnings
| -rw-r--r-- | plugin/feedback/feedback.cc | 2 | ||||
| -rw-r--r-- | plugin/feedback/feedback.h | 6 | ||||
| -rw-r--r-- | plugin/feedback/sender_thread.cc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index f87caa54cbc..a06c0e6c496 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -261,7 +261,7 @@ static int init(void *p) startup_interval= debug_startup_interval; first_interval= debug_first_interval; interval= debug_interval; - user_info= "mysql-test"; + user_info= const_cast<char*>("mysql-test"); } #endif diff --git a/plugin/feedback/feedback.h b/plugin/feedback/feedback.h index 63aa4f8db8a..98939c29d34 100644 --- a/plugin/feedback/feedback.h +++ b/plugin/feedback/feedback.h @@ -58,9 +58,9 @@ class Url { extern Url **urls; extern uint url_count; -extern time_t startup_interval; -extern time_t first_interval; -extern time_t interval; +extern ulong startup_interval; +extern ulong first_interval; +extern ulong interval; /* these are used to communicate with the background thread */ extern mysql_mutex_t sleep_mutex; diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc index f32bf36a634..e6be8e3b9c2 100644 --- a/plugin/feedback/sender_thread.cc +++ b/plugin/feedback/sender_thread.cc @@ -25,9 +25,9 @@ static my_thread_id thd_thread_id; ///< its thread_id static size_t needed_size= 20480; -time_t startup_interval= 60*5; ///< in seconds (5 minutes) -time_t first_interval= 60*60*24; ///< in seconds (one day) -time_t interval= 60*60*24*7; ///< in seconds (one week) +ulong startup_interval= 60*5; ///< in seconds (5 minutes) +ulong first_interval= 60*60*24; ///< in seconds (one day) +ulong interval= 60*60*24*7; ///< in seconds (one week) /** reads the rows from a table and puts them, concatenated, in a String |