database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

5.1-5.2 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-13 08:30:03 +01:00
parent 27095a24f6 f967575457
commit 0d6a25fcc8
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/feedback_plugin_install.result
View File

@ -5,7 +5,7 @@ ACTIVE
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid'; and variable_name not like '%_uid';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
FEEDBACK 1.0 FEEDBACK 1.1
FEEDBACK_SEND_RETRY_WAIT 60 FEEDBACK_SEND_RETRY_WAIT 60
FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_SEND_TIMEOUT 60
FEEDBACK_URL http://mariadb.org/feedback_plugin/post FEEDBACK_URL http://mariadb.org/feedback_plugin/post

2
mysql-test/r/feedback_plugin_load.result
View File

@ -4,7 +4,7 @@ ACTIVE
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid'; and variable_name not like '%_uid';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
FEEDBACK 1.0 FEEDBACK 1.1
FEEDBACK_SEND_RETRY_WAIT 60 FEEDBACK_SEND_RETRY_WAIT 60
FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_SEND_TIMEOUT 60
FEEDBACK_URL http://mariadb.org/feedback_plugin/post FEEDBACK_URL http://mariadb.org/feedback_plugin/post

2
mysql-test/r/feedback_plugin_send.result
View File

@ -4,7 +4,7 @@ ACTIVE
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid'; and variable_name not like '%_uid';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
FEEDBACK 1.0 FEEDBACK 1.1
FEEDBACK_SEND_RETRY_WAIT 60 FEEDBACK_SEND_RETRY_WAIT 60
FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_SEND_TIMEOUT 60
FEEDBACK_URL http://mariadb.org/feedback_plugin/post FEEDBACK_URL http://mariadb.org/feedback_plugin/post

1
mysql-test/t/feedback_plugin_send.test
View File

@ -1,5 +1,4 @@
source t/feedback_plugin_load.test; source t/feedback_plugin_load.test;
source include/big_test.inc;
if (!$MTR_FEEDBACK_PLUGIN) { if (!$MTR_FEEDBACK_PLUGIN) {
skip MTR_FEEDBACK_PLUGIN is not set; skip MTR_FEEDBACK_PLUGIN is not set;

8
plugin/feedback/feedback.cc
View File

@ -346,7 +346,7 @@ mysql_declare_plugin(feedback)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
feedback::init, feedback::init,
feedback::free, feedback::free,
0x0100, 0x0101,
NULL, NULL,
feedback::settings, feedback::settings,
NULL NULL
@ -363,11 +363,11 @@ maria_declare_plugin(feedback)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
feedback::init, feedback::init,
feedback::free, feedback::free,
0x0100, 0x0101,
NULL, NULL,
feedback::settings, feedback::settings,
"1.0", "1.1",
MariaDB_PLUGIN_MATURITY_BETA MariaDB_PLUGIN_MATURITY_BETA
} }
mysql_declare_plugin_end; maria_declare_plugin_end;
#endif #endif