summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help-notwin.result
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-281-0/+9
| |_|/ |/| |
* | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-215/+263
|\ \ \ | | |/ | |/|
| * | Merge mysql-next-mr (revno 2958) --> mysql-next-mr-marcMarc Alff2010-01-121-7/+6
| |\ \
| * | | WL#2360 Performance schemaMarc Alff2010-01-111-217/+265
| | |/ | |/|
* | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-7/+6
|\ \ \ | | |/ | |/|
| * | Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel":Guilhem Bichot2010-01-061-3/+0
| * | WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"Guilhem Bichot2010-01-061-4/+6
| |/
* | Manual merge from next-mr.unknown2010-01-121-0/+7
|/
* don't show --ssl* option if ssl is not compiled inSergei Golubchik2009-12-251-16/+0
* slightly more complete mysqld--help testSergei Golubchik2009-12-241-0/+7
* WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-0/+947