summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-1/+1
|\
| * Fix for valgrind warning: check whether pointer was initialized.Davi Arnaut2010-02-021-1/+1
| * Applying InnoDB snapshot, fixes BUG#46193.Sergey Vojtovich2010-01-222-103/+131
| * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-5/+5
| * Applying InnoDB snapshot, fixes BUG#49238.Sergey Vojtovich2010-01-221-9/+23
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-246-19/+19
|\ \ | |/
| * Apply patch on behalf of Magnus:Davi Arnaut2010-01-201-1/+1
| * Apply patch on behalf of the NDB team:Davi Arnaut2010-01-205-18/+18
| * merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-241-1/+0
| * Applying InnoDB snapshot 5.1-ss6344, Fixes BUG#47814Satya B2009-12-237-60/+193
| * Applying InnoDB snapshot 5.1-ss6344, part 2. Fixes BUG#41609 but doesSatya B2009-12-214-21/+31
* | Postfix for Bug#37408 (fix for Bug#49898).Alexander Nozdrin2009-12-241-1/+0
* | Backporting fix for Bug#49834 from mysql-next-mr-bugfixingAlexander Nozdrin2009-12-231-1/+6
* | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-227-46/+46
|\ \
| * \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-197-39/+46
| |\ \
| | * \ Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-173-2/+43
| | |\ \ | | | |/
| | | * merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-173-2/+43
| | * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-6/+1
| | |\ \ | | | |/
| | | * Fix for BUG#49502 - CMake error compiling 5.1 on WindowsSatya B2009-12-141-1/+1
| | * | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-163-23/+0
| | |\ \
| | * \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-113-31/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merging with mysql-5.1-bugteamV Narayanan2009-12-111-1/+1
| | | |\ \
| | | | * | Bug#49329 example (and other) engines use wrong collation for open tables hashV Narayanan2009-12-111-1/+1
| | | * | | Bug#49521 SHOW CREATE TABLE on IBMDB2I tables has incorrect fk constraint formatV Narayanan2009-12-111-27/+1
| | | |/ /
| | | * | Bug #38883: thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-032-9/+0
| * | | | Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windowsVladislav Vaintroub2009-12-181-7/+0
| | |_|/ | |/| |
* | | | Automerge the build fixes of 5.5.0-m2 back into the tree.Joerg Bruehe2009-12-164-19/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Type change: "fk->name" is no "const char *" any more, rather a "LEX_STRING".MySQL Build Team2009-11-171-5/+5
| * | | The "hash_*" functions have got a prefix "my_" in 2008.MySQL Build Team2009-11-172-12/+12
| * | | Add missing cleanup, needed for "make distcheck" to succeed.MySQL Build Team2009-11-131-1/+1
| * | | Solve a "make" rule issue in the context of dtarce and shared objects:MySQL Build Team2009-11-131-1/+4
* | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-163-23/+0
| |/ / |/| |
* | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1126-90/+140
|\ \ \ | |/ /
| * | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1223-133/+325
| |\ \
| | * \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-103-4/+22
| | |\ \
| | * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0618-121/+285
| | |\ \ \
| | * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-066-4/+32
| | |\ \ \ \
| | * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-052-8/+8
| | |\ \ \ \ \
| * | | | | | | Bug #47139 Test "merge" crashes in "embedded" runAlexey Botchkov2009-11-111-2/+5
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-0513-63/+74
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-022-7/+20
| | |\ \ \ \ \
| | | * \ \ \ \ mergeVladislav Vaintroub2009-10-271-6/+6
| | | |\ \ \ \ \
| | | | * | | | | Bug #48317 cannot build innodb as static library.Vladislav Vaintroub2009-10-261-6/+6
| | | * | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-0/+8
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix for bug#47739: inserts of the review got lost. inserted them again.Horst.Hunger2009-10-231-1/+14
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+8
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-23109-2489/+2448
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Backport of:Konstantin Osipov2009-10-161-1/+1
| | * | | | | | | Backport of:Konstantin Osipov2009-10-145-36/+37
| | * | | | | | | Backport of:Konstantin Osipov2009-10-145-11/+11