Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic merge | Michael Widenius | 2011-06-27 | 2 | -0/+21 |
|\ | |||||
| * | Added test case to show that we get a warning from CHECK TABLE if we force au... | Michael Widenius | 2011-06-13 | 2 | -0/+21 |
* | | Merge 5.2 -> 5.3 | Sergey Petrunya | 2011-06-24 | 4 | -173/+277 |
|\ \ | |||||
| * \ | Merge with 5.1 | Michael Widenius | 2011-06-24 | 2 | -171/+275 |
| |\ \ | |||||
| | * | | ./mtr --suite funcs_1 --ps-protocol | Sergei Golubchik | 2011-06-15 | 2 | -171/+275 |
| * | | | Fixed several errors in Aria discovered by test case for lp:727869 ma_pagecac... | Michael Widenius | 2011-06-24 | 1 | -1/+1 |
| * | | | Fixed portability problem with partiton_error.test | Michael Widenius | 2011-06-13 | 1 | -1/+1 |
* | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 16 | -72/+67 |
|\ \ \ \ | |||||
| * | | | | Fixed LP bug #793436. | Igor Babaev | 2011-06-06 | 1 | -2/+2 |
| * | | | | Added two new flags for the optimizer switch: | Igor Babaev | 2011-06-05 | 2 | -4/+20 |
| * | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 16 | -88/+67 |
| |\ \ \ \ | |||||
| | * | | | | Fixed bugs causing failures fot the funcs_1 test suite. | Igor Babaev | 2011-06-03 | 5 | -20/+80 |
| | * | | | | Applied Sanja's patch to fix LP bug #784297 in the tree for mwl106. | Igor Babaev | 2011-05-27 | 4 | -8/+8 |
| | * | | | | Fixed 3 valgrind bugs. | Igor Babaev | 2011-05-21 | 7 | -86/+15 |
| | * | | | | Merge | Igor Babaev | 2011-05-20 | 14 | -74/+64 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed crashes in the rpl suite due to a bug in Item_func_set_user_var::fix_fi... | Igor Babaev | 2011-05-19 | 9 | -54/+46 |
| | | * | | | | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 6 | -20/+18 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Post-merge fix: adjusted results for the vcol suite. | Igor Babaev | 2010-09-23 | 4 | -12/+10 |
* | | | | | | | | a couple of fixes for pbxt tests | Sergei Golubchik | 2011-06-12 | 2 | -0/+14 |
* | | | | | | | | Another attempt at fixing the rare random failures of rpl_corruption | unknown | 2011-06-14 | 1 | -0/+11 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge with Sergei's tree to get in latest microsecond patches and also fixes ... | Michael Widenius | 2011-06-11 | 19 | -286/+188 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | various fixes for buildbot failures | Sergei Golubchik | 2011-06-10 | 11 | -243/+165 |
| * | | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 8 | -43/+23 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 2 | -2/+2 |
| | * | | | | | | | innodb compatibility fix | Sergei Golubchik | 2011-05-26 | 1 | -4/+4 |
* | | | | | | | | | Fixed build failures with maria3.test and widows build | Michael Widenius | 2011-06-11 | 1 | -1/+1 |
* | | | | | | | | | Removed depricated --maria-options from mysqld. | Michael Widenius | 2011-06-09 | 6 | -122/+4 |
|/ / / / / / / / | |||||
* | | | | | | | | Fixed that SHOW COLUMNS for a virtual persistent column shows 'PERSISTENT' in... | Michael Widenius | 2011-06-06 | 6 | -10/+72 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | More changes from optimizer_use_mrr to optimizer_switch | Sergey Petrunya | 2011-06-03 | 2 | -8/+4 |
* | | | | | | | Buildbot fixes: don't use @@optimizer_use_mrr, it has been moved into @@optim... | Sergey Petrunya | 2011-06-03 | 2 | -2/+6 |
* | | | | | | | Change optimizer_use_mrr=auto|disable|force | Sergey Petrunya | 2011-06-03 | 2 | -3/+6 |
* | | | | | | | Change suite/rpl/t/rpl_row_basic_11bugs.test to require query cache. | Sergey Petrunya | 2011-06-02 | 1 | -0/+1 |
* | | | | | | | automerge | unknown | 2011-05-31 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Attempt to fix rpl.rpl_corruption failure seen in Buildbot on Windows. | unknown | 2011-05-31 | 1 | -0/+10 |
* | | | | | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 3 | -0/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update pbxt suite test results | Sergey Petrunya | 2011-05-29 | 3 | -6/+6 |
| * | | | | | | | | Merge MWL#90 with 5.3-main | Sergey Petrunya | 2011-05-25 | 6 | -6/+18 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | MWL#90: auto-merge with 5.3-main | Sergey Petrunya | 2011-05-09 | 6 | -7/+22 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge MWL#90 into 5.3-main | Sergey Petrunya | 2011-04-30 | 6 | -7/+22 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge MWL#90 with main 5.3 tree | Sergey Petrunya | 2011-04-02 | 6 | -7/+22 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | MWL#90: Address review feedback part #1 | Sergey Petrunya | 2011-03-19 | 2 | -16/+0 |
| | | | | * | | | | | | | | Merge 5.3 -> 5.3-subqueries-mwl90 | Sergey Petrunya | 2011-03-01 | 61 | -73/+4851 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | Post-merge test result update. | Sergey Petrunya | 2011-02-17 | 6 | -11/+19 |
| | | | | * | | | | | | | | | MWL#90: Merge (4) | Sergey Petrunya | 2011-02-15 | 7 | -14/+37 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries | Sergey Petrunya | 2011-02-15 | 7 | -14/+37 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries | Sergey Petrunya | 2010-12-09 | 7 | -14/+37 |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * | | | | | | | | | Post-merge .result fixes | Sergey Petrunya | 2010-07-12 | 3 | -4/+16 |
| | | | | | | | * | | | | | | | | | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries | psergey | 2010-07-11 | 8 | -142/+145 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | | | | Update pbxt testsuite results with latest subquery changes. | Sergey Petrunya | 2010-06-06 | 2 | -5/+5 |
| | | | | | | | | * | | | | | | | | | Always refer to materialized table as "SUBSELECT#%d" where %d is select number | Sergey Petrunya | 2010-04-07 | 2 | -2/+2 |