summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* MWL#67: MRR backportSergey Petrunya2009-12-221-3/+5
* Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-0/+20
* Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-112-1/+21
|\
| * MergeIgor Babaev2009-11-091-0/+19
| |\
| | * Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-0/+19
| | |\
| | | * Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+19
| | | |\
| | | | * Merge from 5.0 for 43414Staale Smedseng2009-08-281-0/+19
| | | | |\
| | | | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-0/+13
| * | | | | Merge of the latest 5.1 changes.Igor Babaev2009-10-261-1/+2
| |\ \ \ \ \ | | |/ / / /
| * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-1/+2
| | |/ / / | |/| | |
* | | | | Automatic merge with 5.1Michael Widenius2009-10-281-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fixed compiler warning messageMichael Widenius2009-10-261-1/+2
| |/ / /
* | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-192-0/+7
|/ / /
* | | Added client functions:Michael Widenius2009-10-022-0/+4
* | | MWL#17: Table elimination: fixes for windowsSergey Petrunya2009-09-161-0/+1
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-2/+1
|\ \ \
| * | | MWL#17: Table-eliminationSergey Petrunya2009-09-011-2/+1
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-0812-66/+108
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-114-10/+33
| |\ \
| | * \ Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-144-4/+5
| | |\ \
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-104-10/+33
| * | | | Auto-mergeIgnacio Galarza2009-07-312-2/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-312-2/+4
| * | | | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-301-0/+1
| * | | | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-1/+2
| |\ \ \ \ | | |/ / /
| | * | | merge to mysql-5.0-bugteamSatya B2009-07-241-1/+9
| | |\ \ \
| | * | | | Fix for BUG#18828 - If InnoDB runs out of undo slots, Satya B2009-07-171-1/+2
| * | | | | Merge from 5.0Staale Smedseng2009-07-231-1/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug #45770 errors reading server SSL files are printed, butStaale Smedseng2009-07-231-1/+9
| | |/ / /
| | * | | Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-1/+1
| * | | | automergeGeorgi Kodinov2009-07-161-9/+0
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Bug #45287: phase 1 : 32 bit compilation warningsGeorgi Kodinov2009-07-151-9/+0
| * | | Automerge.Alexey Kopytov2009-07-121-1/+2
| |\ \ \
| | * | | Bug #45796: invalid memory reads and writes when altering merge Alexey Kopytov2009-07-101-1/+2
| * | | | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-1/+1
| |/ / /
| * | | merging with mysql-5.0-bugteamV Narayanan2009-06-191-1/+1
| |\ \ \ | | |/ /
| | * | Bug#43572 Handle failures from hash_initV Narayanan2009-06-191-1/+1
| | * | MySQL 5.0 backport of Chad Miller's patch for Bug#34309:Davi Arnaut2009-05-301-1/+0
| | * | Updates to build with community features enabled for community builds.MySQL Build Team2009-05-201-3/+0
| | * | Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-062-0/+4
| | |\ \
| | | * \ Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-145-76/+65
| | | |\ \
| | | * \ \ Merge from Tim's 5.0.76-release tree to make 5.0.77 .Chad MILLER2009-01-213-0/+13
| | | |\ \ \
| | | * \ \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-0/+4
| | | |\ \ \ \
| | | * | | | | Buq#32167 another privilege bypass with DATA/INDEX DIRECTORY.Alexey Botchkov2008-07-311-0/+1
| | | * | | | | Merge fix for bug#38180 from mysql-5.0.66a-releaseJonathan Perkin2008-07-181-0/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge from 5.0 trunk.Chad MILLER2008-07-144-49/+59
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-104-64/+10
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-105-36/+43
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-103-6/+10
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Push history-limiting code until after the code that adds new unknown2007-11-141-0/+1