database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity

merge with xtradb-5.5.15

Browse Source 
fix test cases
This commit is contained in:
Sergei Golubchik
2011-07-18 23:04:24 +02:00
parent 9a02c69f5c d4d7a8fa62
commit 4e46d8e5bf
552 changed files with 31999 additions and 54242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/mysqld--help.inc
View File

@@ -22,7 +22,7 @@ perl;
# Plugins which may or may not be there:
@plugins=qw/innodb ndb archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file
thread-concurrency super-large-pages mutex-deadlock-detector null-audit maria aria pbxt oqgraph sphinx/;
xtradb thread-concurrency super-large-pages mutex-deadlock-detector null-audit maria aria pbxt oqgraph sphinx/;
# And substitute the content some environment variables with their
# names:
@@ -39,7 +39,7 @@ perl;
next if /Value \(after reading options\)/; # skip table header
next if /^($re1) /;
next if /^($re2)-/;
$skip=0 if /^ -/;
$skip=0 if /^ -/ or /^$/;
$skip=1 if / --($re2)\b/;
y!\\!/!;
s/[ ]+/ /; # squeeze spaces to remove table formatting