Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 15 | -93/+43 |
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -13/+2 |
* | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 20 | -84/+636 |
|\ | |||||
| * | Merge with 1.0.11-7 Pre-GA - 2010-09-09 | Michael Widenius | 2010-09-28 | 20 | -83/+663 |
* | | oqgraph and sphinx on windows | Sergei Golubchik | 2010-09-15 | 1 | -0/+3 |
* | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | build dynamic plugins with the -shared libtool option to avoid | Sergei Golubchik | 2010-09-09 | 1 | -2/+2 |
* | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 39 | -460/+2345 |
|\ \ | |/ | |||||
| * | Fixed compiler warnings | Michael Widenius | 2010-05-27 | 1 | -2/+1 |
| * | Resolve bzr conflicts | Michael Widenius | 2010-05-26 | 1 | -4/+2 |
| * | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -2/+2 |
| * | Fixed build failures and compiler warning | Michael Widenius | 2010-05-14 | 5 | -8/+10 |
| * | Merge to get PBXT's xstat program | Michael Widenius | 2010-05-12 | 6 | -1/+840 |
| |\ | |||||
| | * | Added the PBXT utility program xtstat | Paul McCullagh | 2010-05-11 | 3 | -1/+834 |
| | * | PBXT now builds correctly when DEBUG enabled | Paul McCullagh | 2010-05-11 | 3 | -0/+6 |
| * | | Set the release date | Paul McCullagh | 2010-05-06 | 1 | -1/+1 |
| * | | Removed debugs | Paul McCullagh | 2010-05-06 | 1 | -2/+0 |
| * | | Added new lock definitions | Paul McCullagh | 2010-05-06 | 2 | -0/+55 |
| * | | Merged with 1.0 trunk | Paul McCullagh | 2010-05-06 | 7 | -55/+207 |
| * | | Merged with 1.0 trunk | Paul McCullagh | 2010-05-05 | 35 | -423/+1262 |
| |/ | |||||
* | | Automerge mariadb 5.1 -> mariadb 5.2 | unknown | 2010-05-05 | 2 | -0/+10 |
|\ \ | |/ | |||||
| * | Fix a bunch of Windows warnings | Bo Thorsen | 2010-04-21 | 2 | -0/+10 |
* | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+1 |
* | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+34 |
* | | Fixed some compiler warnings | Michael Widenius | 2010-03-31 | 1 | -2/+0 |
* | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 1 | -8/+0 |
* | | merge 5.1->5.2 | unknown | 2010-02-01 | 11 | -120/+138 |
|\ \ | |/ | |||||
| * | Removed compiler warnings | Michael Widenius | 2010-01-06 | 4 | -7/+7 |
| * | Merge PBXT fix from Paul. | unknown | 2009-12-29 | 4 | -52/+66 |
| |\ | |||||
| | * | Fixed a bug that resulted in 2-phase commit not being used between PBXT and t... | Paul McCullagh | 2009-12-21 | 4 | -52/+66 |
| * | | Slightly better way to handle max_connections for embedded server. | unknown | 2009-12-22 | 1 | -6/+7 |
| * | | Merge fix for PBXT running inside embedded server (MBug#439889). | unknown | 2009-12-22 | 6 | -60/+63 |
| |\ \ | | |/ | |/| | |||||
| | * | fixed bug #439889: Embedded server asserts on startup because of pbxt | Vladimir Kolesnikov | 2009-12-09 | 2 | -2/+1 |
* | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 4 | -12/+12 |
* | | | Merge with 5.1 | Michael Widenius | 2010-01-04 | 46 | -362/+2579 |
|\ \ \ | |/ / | |||||
| * | | Modified RN291: Fixed bug #489088, I use plugin_unlock to remove the referenc... | Paul McCullagh | 2009-12-10 | 1 | -26/+11 |
| * | | Fixed bug #489088 | Paul McCullagh | 2009-12-01 | 2 | -2/+33 |
| * | | Merged with trunk | Paul McCullagh | 2009-11-27 | 6 | -15/+49 |
| * | | Fixed some warnings from 64-bit Windows | Paul McCullagh | 2009-11-27 | 1 | -3/+3 |
| * | | Merge change from Drizzle | Paul McCullagh | 2009-11-25 | 1 | -1/+4 |
| * | | And don't forget sub-partitions! | Paul McCullagh | 2009-11-25 | 1 | -1/+18 |
| * | | Merged with trunk and added Release notes | Paul McCullagh | 2009-11-25 | 3 | -4/+72 |
| * | | Merged changes for PBXT 1.0.09 RC3 | Paul McCullagh | 2009-11-24 | 44 | -351/+2430 |
* | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+1 |
| |/ | |||||
* | | Merge | Igor Babaev | 2009-11-09 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -2/+2 |
* | | Merge of the latest 5.1 changes. | Igor Babaev | 2009-10-26 | 1 | -3/+9 |
|\ \ | |/ | |||||
| * | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -3/+9 |
* | | Merge | Igor Babaev | 2009-10-17 | 1 | -1/+1 |
|\ \ | |/ |