summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added the default configure COMMUNITY_SERVER and ENABLED_PROFILING toBuild Team2008-11-091-0/+3
* Merge second fix for bug#40546 to the 5.1.30 tree.Joerg Bruehe2008-11-071-6/+15
|\
| * Upmerge the second fix for bug#40546 from 5.0 to 5.1Joerg Bruehe2008-11-071-6/+15
| |\
| | * "spec" file for RPM builds:Joerg Bruehe2008-11-071-2/+10
* | | Back merges from 6.0.8kent.boortz@sun.com2008-11-064-36/+46
* | | Merge main 5.1 and the 5.1 version of the fix for bug#40546Joerg Bruehe2008-11-0631-176/+766
|\ \ \ | |/ / |/| |
| * | BUG#36625: Please remove the rpl_probe and rpl_parse features from the serverSven Sandberg2008-11-063-88/+0
| * | mergeMattias Jonsson2008-11-053-1/+104
| |\ \
| | * | Bug#40494: MYSQL server crashes on range access with partitioning andMattias Jonsson2008-11-053-1/+104
| * | | Merge 5.1-build -> main, to be used in 5.1.30Joerg Bruehe2008-11-0421-47/+590
| |\ \ \ | | |/ /
| | * | Merging with 5.1-5.1.29-rcMats Kindahl2008-11-0319-46/+568
| | |\ \
| | | * \ MergeRamil Kalimullin2008-10-3122-39/+558
| | | |\ \
| | | | * \ Merging with 5.1-5.1.29-rcMats Kindahl2008-10-2916-24/+218
| | | | |\ \
| | | | | * | Fix for bug#23113: Different behavior on altering ENUM fields between 5.0 and...Ramil Kalimullin2008-10-244-10/+51
| | | | | * | merged 5.0-5.1.29-rc -> 5.1-5.1.29-rcGeorgi Kodinov2008-10-231-0/+5
| | | | | |\ \
| | | | | | * \ merged 5.0 main -> 5.0-5.1.29-rcGeorgi Kodinov2008-10-232-1/+6
| | | | | | |\ \
| | | | | * | \ \ merged 5.1-main to 5.1-5.1.29-rcGeorgi Kodinov2008-10-233-3/+3
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merged new test case for BUG#39812 to the head of 5.1Sven Sandberg2008-10-222-0/+10
| | | | | |\ \ \ \ \
| | | | | | * | | | | BUG#39812: Make statement replication default for 5.1 (to match 5.0)Sven Sandberg2008-10-222-0/+10
| | | | | * | | | | | Merge post-merge fix from mysql-5.0-bugteam.Davi Arnaut2008-10-212-0/+2
| | | | | |\ \ \ \ \ \ | | | | | | | |_|/ / / | | | | | | |/| | | |
| | | | | | * | | | | Post-merge fix: drop table at the end of test.Davi Arnaut2008-10-212-0/+2
| | | | | * | | | | | Merge Bug#28323 to mysql-5.1.29-rcDavi Arnaut2008-10-216-11/+147
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | / / / / | | | | | | |/ / / / | | | | | |/| | | |
| | | | | | * | | | Bug#28323: Server crashed in xid cache operationsDavi Arnaut2008-10-216-11/+145
| | | | * | | | | | Bug #40004: Replication failure with no PK + no indexesMats Kindahl2008-10-291-0/+8
| | | | * | | | | | Bug #40004 Replication failure with no PK + no indexesMats Kindahl2008-10-206-15/+332
| | | | |/ / / / /
| | | * | | | | | Fix for bug #40053: 'check table .. for upgrade' doesn't detect Ramil Kalimullin2008-10-171-10/+13
| | | |/ / / / /
| | * | | | | | Bug #40360: Binlog related errors with binlog offMats Kindahl2008-11-032-12/+7
| | * | | | | | Bug #40360: Binlog related errors with binlog offMats Kindahl2008-11-033-1/+32
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge from mysql-5.1.29-rc-releasekent.boortz@sun.com2008-10-276-23746/+64
| |\ \ \ \ \ \
| | * | | | | | More portable sh in configure scriptkent.boortz@sun.com2008-10-111-27/+37
| | * | | | | | Made dist support script more portable shkent.boortz@sun.com2008-10-111-8/+25
| | * | | | | | Aligned declaration and defintion of ha_change_partitions(), to avoid linkkent.boortz@sun.com2008-10-111-2/+2
| | * | | | | | Added "-rc" to the versionBuild Team2008-10-113-3/+3
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Upmerge 5.0-build -> 5.1-buildJoerg Bruehe2008-10-230-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge from mysql-5.0.70-releasetimothy.smith@sun.com2008-10-210-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Auto merge fix for showstopper bug 39353 from mysql-5.0-5.1.29-rc branchmysqldev2008-09-275-13/+38
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ Merge main 5.1 -> 5.1-buildJoerg Bruehe2008-10-232-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Bug#39451 Debug builds broken with Sun Studio compilerKristofer Pettersson2008-10-212-2/+2
| * | | | | | | | | Merge Kent's patch to "zlib/gzio.c" from 5.0-build to 5.1-buildJoerg Bruehe2008-10-141-0/+5
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | The header "config.h" needs to be included "early" to control other headers.Kent Boortz2008-10-131-0/+5
| * | | | | | | | | Merge a merge changeset - no changes.Joerg Bruehe2008-10-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge from main 5.0 branch -> 5.0-buildJoerg Bruehe2008-10-1072-291/+1680
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| * | | | | | | | | Merge main 5.1 -> 5.1-buildJoerg Bruehe2008-10-11208-184888/+149316
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Raise version number after cloning 5.1.29-rckent.boortz@sun.com2008-10-101-1/+1
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge team tree changes up: 5.0-build -> 5.1-buildJoerg Bruehe2008-10-040-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix some bad merge that got the string "5.1-bugteam" into this 5.0 tree.Joerg Bruehe2008-10-041-1/+1
| | * | | | | | | Merge main 5.0 branch -> 5.0-build (team tree).Joerg Bruehe2008-10-0428-915/+258
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge main 5.1 branch -> 5.1-build (team tree).Joerg Bruehe2008-10-0481-2228/+12919
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge from mysql-5.1.28-rc-releasekent@mysql.com2008-09-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Added "-rc" to the release numbermysqldev2008-08-281-1/+1