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

Merge.

Browse Source
This commit is contained in:
Sergey Vojtovich
2013-06-10 15:07:55 +04:00
parent 6a0a4f00a1 fb1a8f04ea
commit 4179b9a53e
21 changed files with 2149 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

@ -377,7 +377,7 @@ sub main {
# directly before it executes them, like "make test-force-pl" in RPM builds.
mtr_report("Logging: $0 ", join(" ", @ARGV));
$DEFAULT_SUITES.=",sequence,sql_discovery" if $source_dist;
$DEFAULT_SUITES.=",sequence,sql_discovery,query_response_time" if $source_dist;
command_line_setup();

8
mysql-test/r/servers.result Normal file
View File

@ -0,0 +1,8 @@
#
# MDEV-4594 - CREATE SERVER crashes embedded
#
CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS(HOST 'localhost');
SELECT * FROM mysql.servers;
Server_name Host Db Username Password Port Socket Wrapper Owner
s1 localhost 0 mysql
DROP SERVER s1;

2
mysql-test/suite/plugins/r/audit_null.result
View File

@ -19,7 +19,7 @@ concat("test1", x)
test1-12
show status like 'audit_null%';
Variable_name Value
Audit_null_called 21
Audit_null_called 22
Audit_null_general_error 1
Audit_null_general_log 7
Audit_null_general_result 5

3
mysql-test/t/mysqld--help.test
View File

@ -27,7 +27,8 @@ perl;
feedback debug temp-pool ssl des-key-file xtradb sequence
thread-concurrency super-large-pages mutex-deadlock-detector
null-audit aria pbxt oqgraph sphinx thread-handling
test-sql-discovery rpl-semi-sync query-cache-info/;
test-sql-discovery rpl-semi-sync query-cache-info
query-response-time/;
# And substitute the content some environment variables with their
# names:

8
mysql-test/t/servers.test Normal file
View File

@ -0,0 +1,8 @@
# Generic tests for servers (do not require FEDERATED)
--echo #
--echo # MDEV-4594 - CREATE SERVER crashes embedded
--echo #
CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS(HOST 'localhost');
SELECT * FROM mysql.servers;
DROP SERVER s1;