diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-09-22 14:01:46 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-09-22 14:01:46 +0300 |
| commit | 1941e33dc86c555c30656c8395f3b0da78663310 (patch) | |
| tree | b021c5e4a3afaa831d8abc62e2afa42adef36adb | |
| parent | 30d225698fe83cdfdec01315980cbc36e47bbc64 (diff) | |
| download | mariadb-git-1941e33dc86c555c30656c8395f3b0da78663310.tar.gz | |
Small change for feedback debug10.4-vicentiu-feedback
| -rw-r--r-- | mysql-test/suite/plugins/t/feedback_plugin_send.test | 4 | ||||
| -rw-r--r-- | plugin/feedback/feedback.cc | 4 | ||||
| -rw-r--r-- | plugin/feedback/sender_thread.cc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/suite/plugins/t/feedback_plugin_send.test b/mysql-test/suite/plugins/t/feedback_plugin_send.test index b28f9d4cb38..4f554bda525 100644 --- a/mysql-test/suite/plugins/t/feedback_plugin_send.test +++ b/mysql-test/suite/plugins/t/feedback_plugin_send.test @@ -14,9 +14,9 @@ if (!$MTR_FEEDBACK_PLUGIN) { # is doing some work in other workers. # -sleep 100; +sleep 10; set global sql_mode=ONLY_FULL_GROUP_BY; -sleep 210; +sleep 50; # The test expects that the plugin will send a report at least 2 times, diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index 826a929643d..be2d6fc856c 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -351,7 +351,7 @@ static int free(void *p) } #ifdef HAVE_OPENSSL -#define DEFAULT_PROTO "https://" +#define DEFAULT_PROTO "http://" #else #define DEFAULT_PROTO "http://" #endif @@ -365,7 +365,7 @@ static MYSQL_SYSVAR_STR(user_info, user_info, NULL, NULL, ""); static MYSQL_SYSVAR_STR(url, url, PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG, "Space separated URLs to send the feedback report to.", NULL, NULL, - DEFAULT_PROTO "mariadb.org/feedback_plugin/post"); + DEFAULT_PROTO "127.0.0.1:8888/feedback_plugin/post"); static MYSQL_SYSVAR_ULONG(send_timeout, send_timeout, PLUGIN_VAR_RQCMDARG, "Timeout (in seconds) for the sending the report.", NULL, NULL, 60, 1, 60*60*24, 1); diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc index b025879b6ee..7c97eec132f 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; -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) +ulong startup_interval= 15; ///< in seconds (5 minutes) +ulong first_interval= 30; ///< in seconds (one day) +ulong interval= 60; ///< in seconds (one week) /** reads the rows from a table and puts them, concatenated, in a String |