diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
| commit | 2ba7ed77aab05004f0c853a77850e325b78a1892 (patch) | |
| tree | 943659d76215e16d0d1946c28683c562debeff34 /plugin/feedback | |
| parent | 63f0669fd6dc430b60ffd5de0bff9854622a1c1a (diff) | |
| parent | 1bb66ea88c4679d6bd3ad1472d75983e66f679ae (diff) | |
| download | mariadb-git-2ba7ed77aab05004f0c853a77850e325b78a1892.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'plugin/feedback')
| -rw-r--r-- | plugin/feedback/feedback.cc | 2 | ||||
| -rw-r--r-- | plugin/feedback/feedback.h | 6 | ||||
| -rw-r--r-- | plugin/feedback/sender_thread.cc | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index dcfa9e07476..28a907a9d93 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -265,7 +265,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 9ac2997c158..bb3f896288d 100644 --- a/plugin/feedback/feedback.h +++ b/plugin/feedback/feedback.h @@ -65,9 +65,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 bbf7f567811..773ae887891 100644 --- a/plugin/feedback/sender_thread.cc +++ b/plugin/feedback/sender_thread.cc @@ -26,9 +26,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 @@ -255,6 +255,7 @@ ret: { if (tables.table) free_tmp_table(thd, tables.table); + thd->cleanup_after_query(); /* clean up, free the thd. reset all thread local status variables to minimize |