summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help-notwin.result
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-1/+1
* A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-031-6/+1
* Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-021-18/+20
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-18/+20
* | WL#5252: Deprecate --optimizer_search_depth=63Roy Lyseng2010-03-011-2/+3
|/
* Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-221-949/+934
|\
| * mergeVladislav Vaintroub2010-02-161-5/+4
| |\
| * \ mergeVladislav Vaintroub2010-02-061-0/+9
| |\ \
| * \ \ mergeVladislav Vaintroub2010-01-181-0/+7
| |\ \ \
| * \ \ \ mergeVladislav Vaintroub2010-01-141-0/+48
| |\ \ \ \
| * | | | | adjust test result fileVladislav Vaintroub2010-01-131-7/+6
| * | | | | remove table formatting (squeeze many spaces into one)Vladislav Vaintroub2010-01-061-914/+912
| * | | | | fix white space differences in mysqld--help-notwin.resultVladislav Vaintroub2010-01-051-212/+212
| * | | | | Fix mysqld--help to ignore optional enginesVladislav Vaintroub2010-01-051-13/+0
| * | | | | mergeVladislav Vaintroub2009-12-251-1/+1
* | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-201-5/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-151-5/+0
| * | | | | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-111-0/+4
| | |_|_|/ | |/| | |
* | | | | WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-02-171-21/+0
* | | | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-02-171-18/+0
|/ / / /
* | | | 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.2010-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