summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-5.5-bugteam.Alexander Nozdrin2010-10-1326-198/+732
|\
| * Merge mysql-5.5-innodb -> mysql-5.5-bugteamVasil Dimov2010-10-112-2/+18
| |\
| | * Merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2010-10-112-2/+18
| | |\
| | | * A more complete fix for bug #57345 btr_pcur_store_position abort for loadJimmy Yang2010-10-113-2/+31
| | | * Bug# 56982 Assertion Failure from ha_innobase::innobase_peek_autoinc() when a...Sunny Bains2010-10-111-1/+5
| * | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-082-2/+2
| * | | Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-10-0721-186/+359
| |\ \ \
| | * | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-0621-184/+334
| | * | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive()Jon Olav Hauglid2010-10-061-2/+25
| * | | | Merge mysql-5.5-innodb -> mysql-5.5-bugteamVasil Dimov2010-10-071-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge from bk-internal.mysql.com/bzrroot/server/mysql-5.5-innodb/Calvin Sun2010-10-0566-2585/+426
| | |\ \ \
| | | * \ \ Merge mysql-5.5-innodb from bk-internal to my local treeVasil Dimov2010-10-041-36/+36
| | | |\ \ \
| | | | * | | Merge Bug#56716 from 5.1Marko Mäkelä2010-10-041-36/+36
| | * | | | | bug#56318: Replication aborts with ER_TOO_BIG_ROWSIZE if innodbCalvin Sun2010-10-051-2/+2
| * | | | | | Bug#56423: Different count with SELECT and CREATE SELECT queriesMartin Hansson2010-10-071-6/+0
| * | | | | | Bug#56397 The version of NDB in MySQL Server should be constantMagnus Blåudd2010-10-071-4/+10
| * | | | | | WL#5503 SEAGULL: Move config/ac-macros/ha_ndbcluster.m4 to storage/ndb/Magnus Blåudd2010-10-072-0/+345
| | |_|_|/ / | |/| | | |
* | | | | | Merge from mysql-5.1-security to mysql-5.5-securityJimmy Yang2010-10-061-0/+9
|\ \ \ \ \ \
| * | | | | | Fix Bug #57255 Cascade Delete results in "Got error -1 from storage engine".Jimmy Yang2010-10-063-0/+22
| * | | | | | merged mysql-5.1 into mysql-5.1-bugteamGeorgi Kodinov2010-10-0523-45/+474
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge from mysql-5.1-bugteam to mysql-5.1-securityJimmy Yang2010-09-0119-136/+364
| | |\ \ \ \ \
| | * | | | | | This is to resolve a hang situation in 5.1 builtin raised byJimmy Yang2010-08-243-0/+71
| | * | | | | | Fix Bug #55277 - Failing assertion: auto_inc > 0Sunny Bains2010-08-052-12/+26
| | * | | | | | Fix bug# 55543 - InnoDB Plugin: Signal 6: Assertion failure in file fil/fil0f...Sunny Bains2010-08-053-10/+19
| | * | | | | | Fix bug #54678, InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlockJimmy Yang2010-08-044-0/+77
| | * | | | | | Fix Bug #54582 stack overflow when opening many tables linked withJimmy Yang2010-08-0416-21/+278
| * | | | | | | Bug#56716 InnoDB locks a record gap without locking the tableMarko Mäkelä2010-10-042-36/+41
| * | | | | | | Bug#56716 InnoDB locks a record gap without locking the tableMarko Mäkelä2010-10-041-36/+36
| * | | | | | | Fix Bug#56340 innodb updates index stats too frequently after non-index updatesVasil Dimov2010-09-302-2/+12
| * | | | | | | Fix a potential bug when using __sync_lock_test_and_set()Vasil Dimov2010-09-301-1/+1
| * | | | | | | Increment InnoDB Plugin version to 1.0.13.Vasil Dimov2010-09-281-1/+1
| * | | | | | | Silence a GCC warning about reaching the end of non-void funcVasil Dimov2010-09-281-1/+1
| * | | | | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-09-284-23/+9
| |\ \ \ \ \ \ \
| * | | | | | | | Fix typo, should be UNIV_SYNC_DEBUG.Vasil Dimov2010-09-151-4/+4
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-3/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+1
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+7
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-5/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-4/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-0/+4
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-3/+8
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-1/+6
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-1/+6
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-5/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-21/+2
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+0
| * | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-0/+4