summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-102-6/+9
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-022-6/+9
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-262-6/+9
| | | | | |\ \ \ \ \ \ \ \
| * | | | | \ \ \ \ \ \ \ \ Merge from 5.0-pe-stage into main.Davi Arnaut2009-05-051-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | A few portability tweaks for Netware, SCO and QNXMySQL Build Team2009-05-012-35/+36
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-051-1/+1
* | | | | | | | | | | | | | Bug#43940 64-bit windows myisamchk doesn't support key_buffer_size > 4GSergey Glukhov2009-05-271-1/+2
* | | | | | | | | | | | | | Bug#44164: TL_WRITE has no description in lock_descriptions[]Davi Arnaut2009-04-141-0/+4
* | | | | | | | | | | | | | merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-34/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | auto-merge -build into -bugteamTimothy Smith2009-04-011-34/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge the main tree into 5.0-buildJoerg Bruehe2009-03-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | | cmd-line-utils/libedit/readline/readline.hunknown2009-03-191-34/+35
| * | | | | | | | | | | | | | Automerge.Alexey Kopytov2009-03-251-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | auto-mergeIgnacio Galarza2009-03-195-75/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Correct failing archive test.Ignacio Galarza2009-03-251-3/+0
* | | | | | | | | | | | | | | Manual merge.Alexey Kopytov2009-03-251-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can Alexey Kopytov2009-03-241-2/+12
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | reverting a bogus fix into 5.1-bugteamGeorgi Kodinov2009-03-201-3/+5
* | | | | | | | | | | | | | Merge contributed automake changes, and 5.1 upstream.Chad MILLER2009-03-191-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ auto-mergeIgnacio Galarza2009-03-191-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ auto-mergeIgnacio Galarza2009-03-175-77/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |