Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 3 | -1/+8 |
|\ | |||||
| * | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 3 | -1/+8 |
| |\ | |||||
| | * | Merge | Igor Babaev | 2011-05-20 | 3 | -1/+8 |
| | |\ | |||||
| | | * | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 3 | -1/+8 |
| | | |\ | |||||
* | | | \ | Merge with Sergei's tree to get in latest microsecond patches and also fixes ... | Michael Widenius | 2011-06-11 | 5 | -6/+13 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 5 | -6/+13 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+1 |
| | * | | | | innodb compatibility fix | Sergei Golubchik | 2011-05-26 | 2 | -0/+11 |
* | | | | | | Fixed build failures with maria3.test and widows build | Michael Widenius | 2011-06-11 | 2 | -2/+3 |
* | | | | | | Merge with 5.2 | Michael Widenius | 2011-06-10 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | A bit better fix for tmp-table problem | Michael Widenius | 2011-06-10 | 1 | -1/+2 |
* | | | | | | | Removed depricated --maria-options from mysqld. | Michael Widenius | 2011-06-09 | 4 | -277/+2 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Fix compile errors and warnings and test errors introduced by microseconds push. | Vladislav Vaintroub | 2011-05-28 | 4 | -57/+7 |
* | | | | | | automatic merge with 5.2 | Michael Widenius | 2011-05-28 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with 5.1 to get in fix wrong setpriority() call | Michael Widenius | 2011-05-26 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Disable call to setpriority() in pbxt. This caused mysqld to run with nice pr... | Michael Widenius | 2011-05-26 | 1 | -0/+2 |
* | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 9 | -166/+122 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | lp:743017 Diverging results with TIME(3) and ranges depending on the executio... | Sergei Golubchik | 2011-03-29 | 2 | -142/+80 |
| * | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -0/+2 |
* | | | | | | Automatic merge | Michael Widenius | 2011-05-19 | 3 | -6/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Original idea from Zardosht Kasheff to add HA_CLUSTERED_INDEX | Michael Widenius | 2011-05-18 | 3 | -6/+16 |
* | | | | | | | Fix compile warning. | Vladislav Vaintroub | 2011-05-18 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Removed some alias warnings | Michael Widenius | 2011-05-18 | 1 | -5/+3 |
* | | | | | | Fix of compiler errors. | unknown | 2011-05-16 | 3 | -1/+5 |
* | | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 27 | -161/+364 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Small CMake fixes : | Vladislav Vaintroub | 2011-05-15 | 1 | -0/+1 |
| * | | | | | merge | Vladislav Vaintroub | 2011-05-14 | 6 | -1/+13 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix bugs found by application verifier : | Vladislav Vaintroub | 2011-05-14 | 1 | -0/+1 |
| | * | | | | | Fix PBXT bugs found while testing with Application Verifier : | Vladislav Vaintroub | 2011-05-14 | 4 | -0/+12 |
| | * | | | | | LPBUG#782269 : Fixed double initialization of condition variables in PBXT. | Vladislav Vaintroub | 2011-05-13 | 1 | -1/+0 |
| * | | | | | | Made test-unit run in parlallel. This was achived by having all aria tests th... | Michael Widenius | 2011-05-13 | 18 | -124/+310 |
| |/ / / / / | |||||
| * | | | | | small enhancement of the create table options feature: | Sergei Golubchik | 2011-05-10 | 1 | -33/+36 |
| * | | | | | Fix Windows embedded warnings | Vladislav Vaintroub | 2011-05-10 | 1 | -3/+4 |
* | | | | | | Added more asserts to find out how maria.maria-big could have failed in build... | Michael Widenius | 2011-05-16 | 3 | -4/+13 |
* | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 145 | -1450/+3410 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-08 | 3 | -0/+6 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Improved 'make test-unit' time slightly | Michael Widenius | 2011-05-05 | 3 | -0/+6 |
| * | | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed compiler warning | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
| * | | | | Automatic merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 4 | -6/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Automatic merge | Michael Widenius | 2011-05-03 | 2 | -4/+2 |
| | |\ \ \ | |||||
| | | * | | | Fixed after-merge failures found by buildbot | Michael Widenius | 2011-05-03 | 2 | -4/+2 |
| | * | | | | Fix Xtradb compile error on Win64 - conversion between pointers of different ... | Vladislav Vaintroub | 2011-05-03 | 1 | -1/+1 |
| | * | | | | Fix compile errors: | Vladislav Vaintroub | 2011-05-02 | 1 | -1/+2 |
| | |/ / / | |||||
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 141 | -1447/+3401 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with xtradb fixes | Michael Widenius | 2011-05-02 | 58 | -875/+1233 |
| | |\ \ \ | |||||
| | | * | | | Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1. | unknown | 2011-04-29 | 58 | -875/+1233 |
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 83 | -572/+2168 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | merge | Mattias Jonsson | 2011-04-20 | 6 | -12/+12 |
| | | |\ \ \ | |||||
| | | | * | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 6 | -12/+12 |