summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge cleanupMarc Alff2009-12-1115-28/+27
* Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-11222-150494/+84841
|\
| * Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-1119-3656/+0
| |\
| | * Remove BitKeeper dir and .cvsignore.Alexander Nozdrin2009-12-1119-3656/+0
| * | Auto-merge (empty) from mysql-next-mr.Alexander Nozdrin2009-12-110-0/+0
| |\ \
| | * \ Auto-merge (empty) from mysql-trunk.Alexander Nozdrin2009-12-110-0/+0
| | |\ \ | | | |/
| | | * Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-1113-101/+258
| | | |\
| | * | \ Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2009-12-11175-146770/+84297
| | |\ \ \
| * | \ \ \ Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2009-12-10175-146770/+84297
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Auto-merge (empty) from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-100-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Auto-merge (empty) from mysql-trunk.Alexander Nozdrin2009-12-100-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | * | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-1066-624/+1308
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Bug#35589 SET PASSWORD caused a crashMagne Mahre2009-12-081-1/+1
| | * | | | Auto mergeHe Zhenxing2009-12-073-0/+16
| | |\ \ \ \
| | | * | | | Bug#47756 Setting 2byte collation ID with 'set names' crashes the serverAlexander Barkov2009-12-073-0/+16
| | * | | | | Merge from trunk-bugfixingHe Zhenxing2009-12-055-11/+36
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Postfix after merge patch for Bug#49020He Zhenxing2009-12-042-3/+3
| | | * | | | Auto merge fixes for Bug#49020He Zhenxing2009-12-047-86/+215
| | | |\ \ \ \
| | | * | | | | BUG#49180, fixed MAXVALUE problemMikael Ronstrom2009-12-023-8/+33
| | * | | | | | Auto merge from 5.1-rep-semisyncHe Zhenxing2009-12-058-88/+219
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Auto merge postfix of Bug#49020He Zhenxing2009-12-041-2/+3
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Post fix for previous patch of Bug#49020He Zhenxing2009-12-041-2/+3
| | | * | | | | Auto Merge fix for Bug#49170He Zhenxing2009-12-041-2/+4
| | | |\ \ \ \ \
| | | | * | | | | Bug#49170 Inconsistent placement of semisync plugin prevents it from getting ...He Zhenxing2009-12-041-2/+4
| | | * | | | | | Auto merge fix for Bug#49020He Zhenxing2009-12-047-85/+213
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | | |/ / / /
| | | | * | | | Bug#49020 Semi-sync master crashed with free_pool == NULL, assertion `free_po...He Zhenxing2009-12-047-85/+213
| | * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-0418-23/+3857
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-0360-378/+3925
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix merge mistake.Alexander Nozdrin2009-12-021-2/+2
| | * | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-02176-2787/+1207
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #49130 Running mtr tests with valgrind and debug produces lots of warningsTor Didriksen2009-12-024-15/+15
| | * | | | | | | | | Bug#33546: Slowdown on re-evaluation of constant expressions.Evgeny Potemkin2009-12-0211-5/+352
| | * | | | | | | | | Auto-merged fix for the bug#34384.Evgeny Potemkin2009-12-017-40/+198
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#34384: Slow down on constant conversion.Evgeny Potemkin2009-11-067-40/+198
| | * | | | | | | | | | mergeMattias Jonsson2009-12-013-9/+60
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#44622: Using PARTITIONs with ARCHIVE engine reports 0 bytes in i_s.TABLESMattias Jonsson2009-08-113-8/+58
| | | * | | | | | | | | | Null Mergeunknown2009-08-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | BUG#45516 SQL thread does not use database charset properlyunknown2009-08-115-0/+106
| | | * | | | | | | | | | | BUG#45516 SQL thread does not use database charset properlyunknown2009-08-115-0/+106
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | BUG#45516 SQL thread does not use database charset properlyunknown2009-08-105-0/+105
| | * | | | | | | | | | | | Bug#49165 Remove unused/confusing code/comments in setup_conds()Tor Didriksen2009-11-273-12/+0
| | * | | | | | | | | | | | backport of:Tor Didriksen2009-11-301-1/+22
| | * | | | | | | | | | | | Merge fix of bug#48351 from 5.1-rep-semisyncHe Zhenxing2009-11-293-12/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bug#48351 Inconsistent library names for semisync pluginHe Zhenxing2009-11-273-12/+12
| | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Use vsnprintf() rather than my_vsnprintf() in DbugVfprintf,Tor Didriksen2009-11-271-1/+5
| | * | | | | | | | | | | merging.Alexey Botchkov2009-11-251-4/+7
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Bug#48878 "Embedded" tests fail due to an unknown variable "shared-memor...Alexey Botchkov2009-11-251-4/+7
| | * | | | | | | | | | | Auto-merge (pull) from mysql-next-mr.Alexander Nozdrin2009-11-2610-8/+1510
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-25161-1360/+1609
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ mergeMattias Jonsson2009-11-258-19/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status