summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove BitKeeper dir and .cvsignore.Alexander Nozdrin2009-12-1119-3656/+0
* Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-1113-101/+258
|\
| * Auto-merge (empty) from mysql-trunk.Alexander Nozdrin2009-12-100-0/+0
| |\ | |/ |/|
* | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-11-122-3/+4
|\ \
| | * Postfix after merge patch for Bug#49020He Zhenxing2009-12-042-3/+3
| | * Auto merge fixes for Bug#49020He Zhenxing2009-12-047-86/+215
| | |\
| | | * Post fix for previous patch of Bug#49020He Zhenxing2009-12-041-2/+3
| | | * Bug#49020 Semi-sync master crashed with free_pool == NULL, assertion `free_po...He Zhenxing2009-12-047-85/+213
| | * | BUG#49180, fixed MAXVALUE problemMikael Ronstrom2009-12-023-8/+33
| | * | Bug#48878 "Embedded" tests fail due to an unknown variable "shared-memor...Alexey Botchkov2009-11-251-4/+7
| |/ /
| * | Auto-merge from mysql-trunk.Alexander Nozdrin2009-11-124-12/+14
| |\ \ | |/ / |/| |
* | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-12206-1545/+4733
|\ \ \
* | | | test updatedAlexey Botchkov2009-11-112-7/+0
* | | | loadxml test update.Alexey Botchkov2009-11-112-1/+2
* | | | Bug #47139 Test "merge" crashes in "embedded" runAlexey Botchkov2009-11-111-2/+5
* | | | Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sq...Alexey Botchkov2009-11-113-5/+10
| | * | Auto-merge from mysql-trunk.Alexander Nozdrin2009-11-121155-33501/+68021
| | |\ \ | | |/ / | |/| |
| * | | Fix build failure.Alexander Nozdrin2009-11-102-1/+8
| * | | Auto-merge from mysql-next-mr-alik.Alexander Nozdrin2009-11-107-1/+151
| |\ \ \ | |/ / / |/| | |
* | | | Merge BUG#48161, BUG#48447Mikael Ronstrom2009-11-067-1/+151
|\ \ \ \
| * | | | Review fixes for BUG#48161 and BUG#48447Mikael Ronstrom2009-11-064-32/+55
| * | | | BUG#48447, BUG#48161, fixed a regression from fix of BUG#6045, where binary c...Mikael Ronstrom2009-11-055-1/+128
| | * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1065-1109/+2248
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-05457-8775/+19008
|\ \ \ \ \ | |/ / / /
* | | | | unit tests for my_vsnprintf,Sergei Golubchik2009-11-044-53/+166
* | | | | sql_plugin.cc: error log messages should not depend on the current_thd lc_mes...Sergei Golubchik2009-11-031-1/+1
* | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-0234-258/+764
* | | | | robust protection against missing DBUG_RETURNSergei Golubchik2009-10-311-34/+26
* | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-3029-789/+1317
| | * | | Fix manual-merge (2nd attempt).Alexander Nozdrin2009-11-101-2/+0
| | * | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-091-1/+1
| | |\ \ \
| | | * | | Fix innodb.test due to Bug#48636.Alexander Nozdrin2009-11-091-1/+1
| | * | | | Fix manual-merge.Alexander Nozdrin2009-11-091-28/+21
| | * | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-6/+10
| | |\ \ \ \ | | | |/ / /
| | | * | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-0511-16/+548
| | | |\ \ \
| | | | * | | Raise version number after cloning 5.1.41unknown2009-11-041-1/+1
| | | | * | | mergeGeorgi Kodinov2009-11-041-1/+1
| | | | |\ \ \
| | | | | * | | version changeGeorgi Kodinov2009-11-041-1/+1
| | | | * | | | mergeGeorgi Kodinov2009-11-041-0/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Disabled the rpl_killed_ddl test in 5.0 because of bug #45520Georgi Kodinov2009-11-041-0/+1
| | | | * | | | Automerge.Davi Arnaut2009-11-031-6/+8
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Fix compiler warnings -- tag unused parameters.Davi Arnaut2009-11-031-6/+8
| | * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-067-2/+532
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | A fix and a test case for Konstantin Osipov2009-11-037-6/+538
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | A fix and a test case forKonstantin Osipov2009-11-038-7/+511
| | * | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-4/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge bug#47867 to 5.1-bugteamMagnus Blåudd2009-11-032-4/+0
| | | |\ \ \ \ \
| | | | * | | | | Bug#47867 compiler warning _WIN32_WINNT macro redefinitionMagnus Blåudd2009-10-062-4/+0
| | | * | | | | | automergeKristofer Pettersson2009-11-03177-1467/+3768
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-066-15/+15
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |