summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111063-35363/+62513
|\
| * 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 manual-merge.Alexander Nozdrin2009-11-091-28/+21
| | | * | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-6/+10
| | | |\ \ \ \
| | | * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-067-2/+532
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-4/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-066-15/+15
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0636-214/+795
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-06137-1097/+2946
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Null-merge patch for Bug#47627Alexander Nozdrin2009-11-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Manual-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-063-2/+40
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-063-7/+98
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-066-5/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-053-2/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0532-157/+187
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Fixed a use of non-initialised variable, cannot use NULL flags if RANGE == NO...Mikael Ronstrom2009-11-041-1/+1
| | * | | | | | | | | | | | | | | | | | MergeMikael Ronstrom2009-11-03310-3185/+8475
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix default.conf.Alexander Nozdrin2009-11-031-1/+1