summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport to 5.4 the following changesets:Konstantin Osipov2009-10-096-34/+22
* Fix for bug #44738 "fill_schema_table_from_frm() opens tables withoutDmitry Lenev2009-10-094-3/+165
* Merge from mysql-next-mr.Alexander Nozdrin2009-10-040-0/+0
|\
| * Fix default.conf.Alexander Nozdrin2009-10-031-1/+1
| * Fix default.conf.Alexander Nozdrin2009-10-031-1/+1
* | Merge from mysq-next-mr-wtf.Alexander Nozdrin2009-10-0283-1238/+3764
|\ \ | |/
| * Merge from mysql-next-mr.Alexander Nozdrin2009-10-0214-880/+1618
| |\
| | * merge mysql-trunk-wl4444_4571 to mysql-wl3220-next-mrGeorgi Kodinov2009-09-2969-452/+3320
| | |\
| | * | Ported WL#3220 to mysql-next-mr.Georgi Kodinov2009-09-2814-880/+1618
| * | | backport of Vladislav Vaintroub2009-09-3011-42/+36
| * | | Backport of this changeset Vladislav Vaintroub2009-09-309-138/+130
| * | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-3020-51/+15
| * | | Backport of the patch Vladislav Vaintroub2009-09-309-26/+32
| * | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-308-87/+15
| * | | fix tree nameVladislav Vaintroub2009-09-301-1/+1
| | |/ | |/|
| * | Merge to mysql-next-mrMikael Ronstrom2009-09-28382-3405/+19340
| |\ \
| * \ \ AutomergeMikael Ronstrom2009-09-105-22/+127
| |\ \ \
| | * | | WL#4571, Enable Key cache defined for a partition to enable more scalability ...Mikael Ronstrom2009-09-107-24/+130
| * | | | WL#4444 Added TRUNCATE partition support, fixes bug#19405 and bug #35111Mikael Ronstrom2009-09-1032-11/+1810
| |/ / /
* | | | After-fix for back-port of WL#3759.Alexander Barkov2009-10-012-3/+3
* | | | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-3011-118/+222
| |/ / |/| |
* | | Update default.conf.Alexander Nozdrin2009-09-281-1/+1
* | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-254-5/+67
|\ \ \ | | |/ | |/|
| * | Merge from mysql-trunk (update default.conf).Alexander Nozdrin2009-09-251-1/+1
| |\ \
| | * | Update default.confAlexander Nozdrin2009-09-251-1/+1
| * | | Merge from mysql-trunl-alik.Alexander Nozdrin2009-09-251-0/+1
| |\ \ \ | | |/ /
| | * | Mark rpl.rpl_innodb_bug30888 experimental.Alexander Nozdrin2009-09-251-0/+1
| * | | Merge from mysql-trunl-alik.Alexander Nozdrin2009-09-251-0/+1
| |\ \ \ | | |/ /
| | * | Mark rpl.rpl_trigger experimental.Alexander Nozdrin2009-09-251-0/+1
| * | | Merge from mysql-trunk-alik (stabilizing changes).Alexander Nozdrin2009-09-244-5/+65
| |\ \ \ | | |/ /
| | * | Disable ndb and rpl_ndb test suites from regular tests.Alexander Nozdrin2009-09-241-0/+5
| | * | Mark some tests experimental.Alexander Nozdrin2009-09-242-5/+55
| * | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-244-4/+4
| |\ \ \
* | \ \ \ merge mysql-next-mr-alikVladislav Vaintroub2009-09-24133-1874/+10490
|\ \ \ \ \ | |/ / / /
| * | | | Ignore a new symbolic link.Alexander Nozdrin2009-09-231-0/+1
| * | | | Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr).Alexander Nozdrin2009-09-23132-1874/+10489
| |\ \ \ \
| | * \ \ \ Merge mysql-next-mr (revno 2882) --> mysql-trunk-signalMarc Alff2009-09-2263-136/+414
| | |\ \ \ \
| | * \ \ \ \ Merge mysql-next-mr (revno 2880) --> mysql-trunk-signalMarc Alff2009-09-205-64/+110
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge mysql-trunk-mr (revno 2879) --> mysql-trunk-signalMarc Alff2009-09-187-30/+40
| | |\ \ \ \ \ \
| | * | | | | | | fixed tree nameMarc Alff2009-09-171-1/+1
| | * | | | | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-17168-908/+6870
| | |\ \ \ \ \ \ \
| | * | | | | | | | Post merge fixesMarc Alff2009-09-1111-291/+210
| | * | | | | | | | WL#2110 (SIGNAL)Marc Alff2009-09-10120-1571/+10263
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | mergeVladislav Vaintroub2009-09-231-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix compile error. definition of VOID in trunk still conflicts with windows h...Vladislav Vaintroub2009-09-131-0/+8
* | | | | | | | | | mergeVladislav Vaintroub2009-09-23241-1143/+7436
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-234-4/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Update disabled.def files.Alexander Nozdrin2009-09-234-4/+4
| * | | | | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
| * | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-235-13/+14
| |\ \ \ \ \ \ \