summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* MergeIgor Babaev2012-03-021-0/+4
|\
| * misc test/result fixesSergei Golubchik2012-03-021-0/+4
* | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.Igor Babaev2012-03-021-0/+8997
|\ \ | |/ |/|
| * Merge.Igor Babaev2012-02-223-2/+24
| |\
| * \ Merged MWL#247 into the latest 5.3.Igor Babaev2011-12-311-0/+8997
| |\ \
| | * | Implementation of the MWL#247: Make the optimizer use extended keys.Igor Babaev2011-12-311-0/+8997
* | | | misc test/result fixesSergei Golubchik2012-03-012-0/+3
* | | | pbxt suite is now a main-pbxt overlaySergei Golubchik2012-02-293-5/+3
* | | | instead of having win/notwin tests that only differ in results,Sergei Golubchik2012-02-233-58/+8
* | | | don't even try to run xtradb-only tests with innodb, use have_xtradb.combinat...Sergei Golubchik2012-02-233-3/+19
* | | | remove few .require files and one duplicate have_*inc file.Sergei Golubchik2012-02-233-11/+5
* | | | overlay support for mysql-test-run and mysqltestSergei Golubchik2012-02-239-8/+50
* | | | allow suite.pm to skip combinations that originate from test/include files.Sergei Golubchik2012-02-073-2/+13
* | | | per-file combinationsSergei Golubchik2012-02-061-0/+8
* | | | move --secure-file-priv from hardcoded to a template. remove redundant suite.optSergei Golubchik2012-02-061-0/+1
* | | | remove few obscure, unused, or misused mtr featuresSergei Golubchik2012-02-064-50/+0
* | | | merge 5.5Vladislav Vaintroub2012-02-271-0/+22
|\ \ \ \
| * \ \ \ 5.3 mergeSergei Golubchik2012-02-241-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Changed names of statistic variables and counting matches instaed of rejected...unknown2012-02-221-3/+3
| * | | | 5.3 mergeSergei Golubchik2012-02-211-0/+22
| |\ \ \ \ | | |/ / /
| | * | | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-161-0/+22
* | | | | merge from 5.5Vladislav Vaintroub2012-02-161-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 5.3.4 mergeSergei Golubchik2012-02-151-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-012-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fixed compiler and test failures found by buildbotMichael Widenius2012-01-082-2/+2
* | | | | mergeVladislav Vaintroub2012-01-262-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fix a few failing tests on win2008r2-vs2010-amd64-debugVladislav Vaintroub2012-01-261-1/+1
| * | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO";Michael Widenius2012-01-241-0/+1
* | | | | further reduce diffs to 5.5, monty reviewVladislav Vaintroub2012-01-241-1/+1
* | | | | mergeVladislav Vaintroub2012-01-2412-12/+276
|\ \ \ \ \ | |/ / / /
| * | | | mergeSergei Golubchik2012-01-165-31/+31
| |\ \ \ \
| * \ \ \ \ mysql-5.5 mergeSergei Golubchik2012-01-162-1/+146
| |\ \ \ \ \
| | * | | | | BUG#11745230Luis Soares2011-12-011-0/+137
| | * | | | | BUG#11745230: 12133: MASTER.INDEX FILE KEEPS MYSQLD FROM STARTING IFLuis Soares2011-11-241-1/+9
| | * | | | | BUG#11754168: Reverting back changes as it is making other tests fail.Sneha Modi2011-11-033-193/+26
| | * | | | | BUG#11754168:PARTS OF INDEX_MERGE_INNODB.TEST ARE DISABLED DUE TO EXPLAIN DIFFSSneha MOdi2011-11-023-26/+193
| * | | | | | remove duplicate .opt with AUTH_PLUGIN_SOSergei Golubchik2012-01-131-0/+1
| * | | | | | 5.3 mergeSergei Golubchik2012-01-139-11/+129
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Backport of WL#5953 from MySQL 5.6unknown2011-12-191-2/+2
| | * | | | | Fixed LP bug #904832.Igor Babaev2011-12-181-0/+108
| | * | | | | Made the optimizer switch flags 'outer_join_with_cache', 'semijoin_with_cache'Igor Babaev2011-12-151-0/+6
| | * | | | | Merge with 5.2.Michael Widenius2011-12-118-0/+119
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge with 5.1Michael Widenius2011-11-302-5/+1
| | | |\ \ \ \
| | | | * | | | Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-0/+1
| | | | * | | | test both federated and federatedX in the federated suite.Sergei Golubchik2011-11-301-5/+0
| | | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-248-0/+123
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-0/+5
| | | | |\ \ \ \
| | | | * \ \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-217-0/+118
| | | | |\ \ \ \ \
| | * | | | | | | | Set new default values for the optimizer switch flags 'derived_merge'Igor Babaev2011-11-261-0/+3
* | | | | | | | | | merge 5.5Vladislav Vaintroub2012-01-115-31/+31
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |