diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-18 23:04:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-18 23:04:24 +0200 |
| commit | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (patch) | |
| tree | c6612dcc1d0fbd801c084e6c36307d9e5913a293 /mysql-test/include/mysqld--help.inc | |
| parent | 9a02c69f5c6766eaf552284a2a4dd0f1d26ecd2c (diff) | |
| parent | d4d7a8fa62c406be73f6c0f6d75e795293db548b (diff) | |
| download | mariadb-git-4e46d8e5bff140f2549841167dc4b65a3c0a645d.tar.gz | |
merge with xtradb-5.5.15
fix test cases
Diffstat (limited to 'mysql-test/include/mysqld--help.inc')
| -rw-r--r-- | mysql-test/include/mysqld--help.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc index a39615d6011..91fe9bf00e3 100644 --- a/mysql-test/include/mysqld--help.inc +++ b/mysql-test/include/mysqld--help.inc @@ -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 |