summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | | Backport of:Konstantin Osipov2009-10-132-8/+5
| * | | | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-023-4/+22
| | |_|/ / / / | |/| | | | |
| * | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce...He Zhenxing2009-10-021-0/+8
| * | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-212-5/+6
| |\ \ \ \ \ \
| | * | | | | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-152-5/+6
| | | |/ / / / | | |/| | | |
| * | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-211-1/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-201-0/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-19100-2458/+2409
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-148-26/+18
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-307-18/+1
| * | | | | | | | | Backport of the patch Vladislav Vaintroub2009-09-301-4/+4
| * | | | | | | | | merge mysql-next-mr-alikVladislav Vaintroub2009-09-241-1/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2882) --> mysql-trunk-signalMarc Alff2009-09-221-1/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2880) --> mysql-trunk-signalMarc Alff2009-09-201-7/+7
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql-trunk-mr (revno 2879) --> mysql-trunk-signalMarc Alff2009-09-182-9/+12
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-1721-396/+410
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-1/+1
| * | | | | | | | | | | | | | mergeVladislav Vaintroub2009-09-2325-413/+431
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | This is the downport ofVladislav Vaintroub2009-09-112-4/+26
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | manual merge mysql-5.1-bugteam --> mysql-trunk-mergeGleb Shchepa2009-12-046-71/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ merge to mysql-5.1-bugteamSatya B2009-12-0110-139/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-0110-139/+4
| * | | | | | | | | | | | | | | Addition to Innodb Plugin 1.0.6 snapshotSatya B2009-12-011-11/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys...Satya B2009-12-0258-251/+1312
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Applying InnoDB Plugin 1.0.6 snapshot, Fixes BUG#48469 Satya B2009-11-305-7/+38