summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* WL#2360 Performance schemaMarc Alff2010-01-1164-0/+16877
* WL#2360 Performance schemaMarc Alff2010-01-061-2/+2
* mergedSergei Golubchik2009-12-246-21/+28
|\
| * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-241-1/+0
| |\
| | * 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
| | | |\
| * | | \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-234-19/+22
| |\ \ \ \
| | * \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-228-49/+49
| | |\ \ \ \
| | * \ \ \ \ Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-164-19/+22
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | 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
| * | | | | | | Bug#49834 - fixed a bug introduced by mismerge.Vladislav Vaintroub2009-12-221-1/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-228-39/+101
|/ / / / / /
* | | | | | Fix inconsistently defined THR_LOCK_myisam_mmapVladislav Vaintroub2009-12-202-9/+9
* | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-198-42/+49
|\ \ \ \ \ \
| * \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-1666-346/+1338
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-1119-23/+183
| | |\ \ \ \ \ \
| | * | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-1/+1
| * | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-173-4/+45
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | 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 from mysql-trunk-merge.Alexander Nozdrin2009-12-164-37/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | 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
* | | | | | | | | mergeVladislav Vaintroub2009-12-181-7/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windowsVladislav Vaintroub2009-12-181-7/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-163-23/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-163-23/+0
| |/ / / / /
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-1263-323/+1338
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1126-90/+140
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 9. Fixes BUG#48526, BUG#48317Satya B2009-11-304-3/+54
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 8. Fixes BUG#48782Satya B2009-11-305-38/+31