summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* check for poll.hVladislav Vaintroub2010-02-143-0/+3
* remove use of undocumented __sparcv8plus - this macro does not seem to be def...Vladislav Vaintroub2010-02-141-4/+4
* mergeVladislav Vaintroub2010-02-13216-2387/+5991
|\
| * Null-merge (configure.in) from mysql-trunk.Alexander Nozdrin2010-02-130-0/+0
| |\
| | * Raise version number after cloning 5.5.2-m2unknown2010-02-121-1/+1
| * | Upmerge a merge changeset, whose contents was already here,Joerg Bruehe2010-02-120-0/+0
| |\ \ | | |/
| | * Automerge from central "trunk-bugfixing".Joerg Bruehe2010-02-1235-113/+641
| | |\
| * | \ Null-upmerge a fix to the RPM spec file, this one was already correct.Joerg Bruehe2010-02-120-0/+0
| |\ \ \ | | |/ /
| | * | Upmerge the RPM spec file correction: "release" was missing.Joerg Bruehe2010-02-121-0/+2
| | |\ \
| | | * | Correction: The "release" setting had got lost in the RPM spec file.Joerg Bruehe2010-02-121-0/+2
| * | | | Upmerge the spec file alignment from current 5.5 to the next milestone.Joerg Bruehe2010-02-121-180/+334
| |\ \ \ \ | | |/ / /
| | * | | Upmerge the spec file alignment from 5.1 to 5.5,Joerg Bruehe2010-02-121-180/+332
| | |\ \ \ | | | |/ /
| | | * | Upmerge changes done to the generic spec file in 5.0 to 5.1,Joerg Bruehe2010-02-111-186/+344
| | | |\ \
| | | | * | Cleanup in the RPM spec file:Joerg Bruehe2010-02-021-17/+17
| | | | * | Spec file for "generic" RPMs:Joerg Bruehe2010-02-021-98/+185
| * | | | | merge with latest next-mr-bugfixingGuilhem Bichot2010-02-1294-159/+3471
| |\ \ \ \ \
| | * \ \ \ \ merge with latest next-mr-bugfixingGuilhem Bichot2010-02-0994-159/+3471
| | |\ \ \ \ \
| | | * | | | | Corrections to pseudi_thread_id_basic test (WL4738)Omer BarNir2010-02-042-4/+0
| | | * | | | | Fixes to PB failiurs Omer BarNir2010-02-039-3/+22
| | | * | | | | Modified and added tests following review of WL#4738.Omer BarNir2010-01-2894-159/+3456
| * | | | | | | Fix tree name.Alexander Nozdrin2010-02-121-1/+1
| * | | | | | | Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-1211-37/+195
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Auto-merged fix for the bug#50539.Evgeny Potemkin2010-02-124-14/+50
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Bug#50539: Wrong result when loose index scan is used for an aggregateEvgeny Potemkin2010-02-124-14/+50
| | * | | | | | | Bug #43913 rpl_cross_version can't pass on conflicts complainig clash withunknown2010-02-121-4/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug #43913 rpl_cross_version can't pass on conflicts complainig clash withunknown2010-02-123-6/+2
| | * | | | | | | merge from mysql-trunk-bugfixingMagne Mahre2010-02-114-4/+90
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug#50574 5.5.x allows spatial indexes on non-spatial columns, Magne Mahre2010-02-114-4/+89
| | * | | | | | | mergeMagne Mahre2010-02-113-15/+54
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug#50542 5.5.x doesn't check length of key prefixes: Magne Mahre2010-02-113-15/+54
| * | | | | | | | Automerge from mysql-next-mr-bugfixing.Luis Soares2010-02-1198-1947/+1174
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Manual merge from mysql-next-mr bug branch.Luis Soares2010-02-108-77/+167
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-101-3/+0
| | | * | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-105-0/+32
| | | * | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-097-74/+135
| | * | | | | | | | Automerge from mysql-trunk-bugfixing.Luis Soares2010-02-103-7/+22
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | BUG#50984: check_testcase fails for rpl_tmp_table_and_DDLLuis Soares2010-02-103-7/+22
| | * | | | | | | | mergeMattias Jonsson2010-02-105-6/+49
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Bug#50201: Server crashes in explain_filename on an InnoDB partitioned tableMattias Jonsson2010-02-105-6/+49
| | * | | | | | | Auto-merge (empty) from mysql-trunk-bugfixing.Alexander Nozdrin2010-02-090-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-02-093-11/+9
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | * | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-096-16/+13
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Patch to fix bug#50981. Replace now the result ::1 by localhost for Windows. ...Horst.Hunger2010-02-081-0/+3
| | * | | | | | | mergeVladislav Vaintroub2010-02-0521-88/+318
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge mysql-next-mr-marc --> mysql-next-mr-bugfixingMarc Alff2010-02-0521-88/+318
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge from mysql-next-mrMarc Alff2010-02-051-2/+1
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marcMarc Alff2010-02-05212-7554/+5042
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2966) --> mysql-next-mr-marcMarc Alff2010-02-011-1/+4
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marcMarc Alff2010-01-2765-776/+4433
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ local mergeMarc Alff2010-01-274-18/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \