summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol
Commit message (Expand)AuthorAgeFilesLines
* Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-044-12/+10
|\
| * MergeIgor Babaev2011-05-204-12/+10
| |\
| | * Merged the code of MWL#106 into 5.3Igor Babaev2011-05-164-12/+10
| | |\
| | | * Post-merge fix: adjusted results for the vcol suite.Igor Babaev2010-09-234-12/+10
* | | | Merge 5.3->main -> 5.3-mwl90Sergey Petrunya2011-05-293-0/+12
|\ \ \ \
| * \ \ \ Merge MWL#90 into 5.3-mainSergey Petrunya2011-04-303-0/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge MWL#90 with main 5.3 treeSergey Petrunya2011-04-023-0/+12
| | |\ \ \
| | | * \ \ Merge 5.3 -> 5.3-subqueries-mwl90Sergey Petrunya2011-03-0122-39/+33
| | | |\ \ \
| | | * | | | Post-merge test result update.Sergey Petrunya2011-02-172-4/+4
| | | * | | | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueriesSergey Petrunya2011-02-153-4/+16
| | | |\ \ \ \
| | | | * \ \ \ MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueriesSergey Petrunya2010-12-093-4/+16
| | | | |\ \ \ \
| | | | | * | | | Post-merge .result fixesSergey Petrunya2010-07-123-4/+16
| | | | | | |_|/ | | | | | |/| |
* | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-284-2/+75
* | | | | | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e...Michael Widenius2011-05-213-22/+22
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge with dynamic column codeMichael Widenius2011-05-122-0/+20
|\ \ \ \ \ \ \
| * | | | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-082-0/+20
| |/ / / / / /
* | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Amend the previous cset:Sergey Petrunya2011-04-043-12/+12
| |/ / / / / |/| | | | |
* | | | | | Merge with 5.2Michael Widenius2011-03-092-6/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-282-6/+4
* | | | | Merge with 5.1Michael Widenius2011-01-1122-39/+33
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | virtual columns:Sergei Golubchik2010-12-3122-39/+33
* | | | Remove .moved filesSergey Petrunya2010-11-151-24/+0
* | | | Merge MWL#121-125 DS-MRR improvements into MWL#128 Classic hash join treeSergey Petrunya2010-11-151-1/+2
|\ \ \ \
| * \ \ \ Merge MWL#121-124 DS-MRR support for key-ordered reads + MWL#128 BNL-Hash joinSergey Petrunya2010-11-011-1/+2
| |\ \ \ \
| | * \ \ \ MWL#121-124 DS-MRR support for key-ordered retrieval, etcSergey Petrunya2010-11-012-2/+3
| | |\ \ \ \
| | | * | | | - Remove out-of-date comments Sergey Petrunya2010-08-142-2/+3
| | | | |_|/ | | | |/| |
* | | | | | MergeIgor Babaev2010-11-024-24/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge 5.3-mwl128 -> 5.3Igor Babaev2010-10-274-24/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | MWL#128: Added into EXPLAIN output info about types of the used join buffers andIgor Babaev2010-10-183-3/+3
| | * | | Adjusted some results from the vcol, pbxt, maria test suites afterIgor Babaev2010-10-021-1/+1
| | |/ /
* | | | merge w/ 5.2Sergei Golubchik2010-11-023-5/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | fix LIKE in a vcol function, broken by a fix for mysql bug#54568.Sergei Golubchik2010-10-303-5/+5
* | | Merge MariaDB 5.2 -> MariaDB 5.3Sergey Petrunya2010-10-141-19/+0
* | | Merge 5.2->5.3Sergey Petrunya2010-10-1019-205/+668
|\ \ \ | |/ / | | / | |/ |/|
| * restore shifted error numbersSergei Golubchik2010-09-123-22/+22
| * Fixed compiler warnings and test failuresMichael Widenius2010-08-061-0/+2
| * Check of maria engine presence added.unknown2010-08-041-1/+3
| * Fix for launchpad bug #612894unknown2010-08-032-0/+126
| * Fixed bug #610890.Igor Babaev2010-07-282-0/+18
| * MergeIgor Babaev2010-07-262-0/+36
| |\
| | * Fixed bug #607177.Igor Babaev2010-07-202-0/+36
| * | MergeIgor Babaev2010-07-212-0/+18
| |\ \
| | * | Fixed bug #607168.Igor Babaev2010-07-202-0/+18
| | |/
| * | Fixed bug #607566.Igor Babaev2010-07-192-0/+25
| |/
| * MergeIgor Babaev2010-07-172-1/+51
| |\
| | * Fixed bug #604503.Igor Babaev2010-07-172-0/+47
| * | Fixed bug #603186.Igor Babaev2010-07-152-0/+34
| |/
| * Fixed bug #603654.Igor Babaev2010-07-132-0/+22
| * Fixed bug #604549.Igor Babaev2010-07-1315-204/+223