summaryrefslogtreecommitdiff
path: root/storage/pbxt
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-2515-93/+43
* merge.Sergei Golubchik2010-11-251-13/+2
* Automatic merge with 5.1Michael Widenius2010-10-0620-84/+636
|\
| * Merge with 1.0.11-7 Pre-GA - 2010-09-09Michael Widenius2010-09-2820-83/+663
* | oqgraph and sphinx on windowsSergei Golubchik2010-09-151-0/+3
* | merge with 5.1Sergei Golubchik2010-09-111-2/+2
|\ \ | |/
| * build dynamic plugins with the -shared libtool option to avoidSergei Golubchik2010-09-091-2/+2
* | merge 5.1->5.2Sergei Golubchik2010-06-0139-460/+2345
|\ \ | |/
| * Fixed compiler warningsMichael Widenius2010-05-271-2/+1
| * Resolve bzr conflictsMichael Widenius2010-05-261-4/+2
| * Merge with MySQL 5.1.47Michael Widenius2010-05-261-2/+2
| * Fixed build failures and compiler warningMichael Widenius2010-05-145-8/+10
| * Merge to get PBXT's xstat programMichael Widenius2010-05-126-1/+840
| |\
| | * Added the PBXT utility program xtstatPaul McCullagh2010-05-113-1/+834
| | * PBXT now builds correctly when DEBUG enabledPaul McCullagh2010-05-113-0/+6
| * | Set the release datePaul McCullagh2010-05-061-1/+1
| * | Removed debugsPaul McCullagh2010-05-061-2/+0
| * | Added new lock definitionsPaul McCullagh2010-05-062-0/+55
| * | Merged with 1.0 trunkPaul McCullagh2010-05-067-55/+207
| * | Merged with 1.0 trunkPaul McCullagh2010-05-0535-423/+1262
| |/
* | Automerge mariadb 5.1 -> mariadb 5.2unknown2010-05-052-0/+10
|\ \ | |/
| * Fix a bunch of Windows warningsBo Thorsen2010-04-212-0/+10
* | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-1/+1
* | Maria WL#61unknown2010-04-011-0/+34
* | Fixed some compiler warningsMichael Widenius2010-03-311-2/+0
* | mwl:98 - libservicesSergei Golubchik2010-03-031-8/+0
* | merge 5.1->5.2unknown2010-02-0111-120/+138
|\ \ | |/
| * Removed compiler warningsMichael Widenius2010-01-064-7/+7
| * Merge PBXT fix from Paul.unknown2009-12-294-52/+66
| |\
| | * Fixed a bug that resulted in 2-phase commit not being used between PBXT and t...Paul McCullagh2009-12-214-52/+66
| * | Slightly better way to handle max_connections for embedded server.unknown2009-12-221-6/+7
| * | Merge fix for PBXT running inside embedded server (MBug#439889).unknown2009-12-226-60/+63
| |\ \ | | |/ | |/|
| | * fixed bug #439889: Embedded server asserts on startup because of pbxtVladimir Kolesnikov2009-12-092-2/+1
* | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-064-12/+12
* | | Merge with 5.1Michael Widenius2010-01-0446-362/+2579
|\ \ \ | |/ /
| * | Modified RN291: Fixed bug #489088, I use plugin_unlock to remove the referenc...Paul McCullagh2009-12-101-26/+11
| * | Fixed bug #489088Paul McCullagh2009-12-012-2/+33
| * | Merged with trunkPaul McCullagh2009-11-276-15/+49
| * | Fixed some warnings from 64-bit WindowsPaul McCullagh2009-11-271-3/+3
| * | Merge change from DrizzlePaul McCullagh2009-11-251-1/+4
| * | And don't forget sub-partitions!Paul McCullagh2009-11-251-1/+18
| * | Merged with trunk and added Release notesPaul McCullagh2009-11-253-4/+72
| * | Merged changes for PBXT 1.0.09 RC3Paul McCullagh2009-11-2444-351/+2430
* | | merge 5.1-> 5.2unknown2009-12-081-1/+1
|\ \ \ | | |/ | |/|
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+1
| |/
* | MergeIgor Babaev2009-11-091-2/+2
|\ \ | |/
| * Added federatedx storage engineMichael Widenius2009-10-301-2/+2
* | Merge of the latest 5.1 changes.Igor Babaev2009-10-261-3/+9
|\ \ | |/
| * Fixed compiler warning messageMichael Widenius2009-10-261-3/+9
* | MergeIgor Babaev2009-10-171-1/+1
|\ \ | |/