database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.0.14 into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2014-10-15 12:59:13 +02:00
parent f947f73b2b f1afc003ee
commit f62c12b405
2115 changed files with 87968 additions and 80173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/plugins/r/false_dupes-6543.result Normal file
View File

@@ -0,0 +1,5 @@
install soname 'ha_federated';
install soname 'ha_federated';
install soname 'ha_federatedx';
ERROR HY000: Function 'FEDERATED' already exists
uninstall soname 'ha_federated';

9
mysql-test/suite/plugins/r/feedback_plugin_load.result
View File

@@ -10,3 +10,12 @@ FEEDBACK_SEND_RETRY_WAIT 60
FEEDBACK_SEND_TIMEOUT 60
FEEDBACK_URL http://mariadb.org/feedback_plugin/post
FEEDBACK_USER_INFO mysql-test
SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK
WHERE VARIABLE_NAME LIKE 'Collation used %'
ORDER BY VARIABLE_NAME;
VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used binary
1 Collation used latin1_bin
1 Collation used latin1_swedish_ci
1 Collation used utf8_bin
1 Collation used utf8_general_ci

11
mysql-test/suite/plugins/r/feedback_plugin_send.result
View File

@@ -4,12 +4,21 @@ ACTIVE
select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid';
VARIABLE_NAME VARIABLE_VALUE
FEEDBACK used 2
FEEDBACK used 3
FEEDBACK version 1.1
FEEDBACK_SEND_RETRY_WAIT 60
FEEDBACK_SEND_TIMEOUT 60
FEEDBACK_URL http://mariadb.org/feedback_plugin/post
FEEDBACK_USER_INFO mysql-test
SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK
WHERE VARIABLE_NAME LIKE 'Collation used %'
ORDER BY VARIABLE_NAME;
VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used binary
1 Collation used latin1_bin
1 Collation used latin1_swedish_ci
1 Collation used utf8_bin
1 Collation used utf8_general_ci
feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent
feedback plugin: server replied 'ok'
feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent

18
mysql-test/suite/plugins/t/false_dupes-6543.test Normal file
View File

@@ -0,0 +1,18 @@
#
# MDEV-6543 Crash if enable 'federatedx' when 'federated' plugin already enabled, and vice-versa
#
if(!$HA_FEDERATED_SO) {
skip Needs ha_federated.so;
}
if(!$HA_FEDERATEDX_SO) {
skip Needs ha_federatedx.so;
}
install soname 'ha_federated';
# note: no error below! install soname ignores already loaded plugins
install soname 'ha_federated';
# note: an error here, even though plugin name is the same!
--error ER_UDF_EXISTS
install soname 'ha_federatedx';
uninstall soname 'ha_federated';

13
mysql-test/suite/plugins/t/feedback_plugin_load.test
View File

@@ -8,3 +8,16 @@ select plugin_status from information_schema.plugins where plugin_name='feedback
--sorted_result
select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid';
# Embedded server does not use the table mysqld.user and thus
# does not automatically use latin1_bin on startup. Use it manually.
--disable_query_log
if (`SELECT VERSION() LIKE '%embedded%'`)
{
DO _latin1'test' COLLATE latin1_bin;
}
--enable_query_log
SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK
WHERE VARIABLE_NAME LIKE 'Collation used %'
ORDER BY VARIABLE_NAME;