summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Bug#48929 Error in Accept() if using many file descriptorsMagne Mahre2010-02-141-10/+54
* Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-125-34/+37
|\
| * Auto-merged fix for the bug#50539.Evgeny Potemkin2010-02-122-11/+7
| |\
| | * Bug#50539: Wrong result when loose index scan is used for an aggregateEvgeny Potemkin2010-02-122-11/+7
| * | Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with2010-02-121-4/+1
| |\ \ | | |/
| | * Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with2010-02-121-4/+1
| * | merge from mysql-trunk-bugfixingMagne Mahre2010-02-112-4/+15
| |\ \ | | |/
| | * Bug#50574 5.5.x allows spatial indexes on non-spatial columns, Magne Mahre2010-02-112-4/+14
| * | mergeMagne Mahre2010-02-111-15/+14
| |\ \ | | |/
| | * Bug#50542 5.5.x doesn't check length of key prefixes: Magne Mahre2010-02-111-15/+14
* | | Automerge from mysql-next-mr-bugfixing.Luis Soares2010-02-1128-179/+349
|\ \ \ | |/ /
| * | Manual merge from mysql-next-mr bug branch.Luis Soares2010-02-107-70/+130
| |\ \
| | * | 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-096-67/+98
| * | | mergeMattias Jonsson2010-02-102-6/+14
| |\ \ \ | | | |/ | | |/|
| | * | Bug#50201: Server crashes in explain_filename on an InnoDB partitioned tableMattias Jonsson2010-02-102-6/+14
| | * | Auto-merge from mysql-trunk.Alexander Nozdrin2010-02-0558-458/+1046
| | |\ \
| | | * \ Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-032-13/+13
| | | |\ \
| | | * \ \ Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-3/+9
| | | |\ \ \
| | * | \ \ \ Auto mergeHe Zhenxing2010-02-046-9/+24
| | |\ \ \ \ \
| | * \ \ \ \ \ Auto merge from 5.1-rep-semisyncHe Zhenxing2010-02-041-0/+11
| | |\ \ \ \ \ \
| | | * | | | | | Bug#49894 shifted MYSQL_REPLICATION_PLUGIN numberHe Zhenxing2010-02-041-0/+11
| * | | | | | | | mergeVladislav Vaintroub2010-02-053-45/+83
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql-next-mr-marc --> mysql-next-mr-bugfixingMarc Alff2010-02-053-45/+83
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marcMarc Alff2010-02-0548-6694/+794
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | * | | | | | | | Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marcMarc Alff2010-01-2724-420/+1523
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#34455 Ambiguous foreign keys syntax is acceptedMarc Alff2010-01-252-31/+66
| | | * | | | | | | | | Bug#11714 Non-sensical ALTER TABLE ADD CONSTRAINT allowedMarc Alff2010-01-221-7/+3
| | | * | | | | | | | | Bug#50513 Build failure with ifdef HAVE_OPENSSL + ifndef HAVE_YASSLMarc Alff2010-01-211-7/+14
| * | | | | | | | | | | mergeVladislav Vaintroub2010-02-052-6373/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-052-6373/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Bug#50057: 'SHOW PROFILE CPU' port for Windows.Vladislav Vaintroub2010-02-052-0/+45
| |/ / / / / / / / / /
| * | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-0543-239/+665
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ BUG#50364: manual merge to mysql-next-mr-bugfixing.Luis Soares2010-02-035-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basicLuis Soares2010-02-036-9/+24
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Auto Merge fix for bug#501572010-01-311-5/+5
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Manual Merge for bug#501572010-01-311-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | BUG#50157 Assertion !active_tranxs_->is_tranx_end_pos(..) in ReplSemiSyncMast...2010-01-311-5/+5
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Bug #50192 Strange effect in replication test, trigger, auto_increment Andrei Elkin2010-01-295-12/+14
| * | | | | | | | | | Merging with mysql-next-mr-bugfixing.Mats Kindahl2010-01-255-17/+19
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fixes for gcc 4.4.1 warningsGuilhem Bichot2010-01-255-17/+19
| * | | | | | | | | | | Merging with mysql-next-mr-bugfixing.Mats Kindahl2010-01-2514-63/+712
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-2514-63/+712
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Patch to eliminate warnings in mysql-next-mr-bugteam.Mats Kindahl2010-01-2511-25/+25
| |/ / / / / / / / / /
| * | | | | | | | | | Backport from mysql-6.0-codebase of:Jon Olav Hauglid2010-01-221-1/+1
| * | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-2210-357/+811
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-216-80/+127
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | auto merge from mysql-5.1-rep+3.Luis Soares2010-02-093-8/+51
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Auto Merge from 5.1-rep+22010-01-2059-1150/+2974
| |\ \ \ \ \ \ \ \ \ \ \