Alexander Nozdrin 84caa9480f Backporting fix for Bug#49834 from mysql-next-mr-bugfixing ... into mysql-trunk-bugfixing. Original revision: ------------------------------------------------------------ revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0 committer: Vladislav Vaintroub <vvaintroub@mysql.com> branch nick: mysql-next-mr-bugfixing timestamp: Tue 2009-12-22 12:53:11 +0100 message: Bug#49834 - fixed a bug introduced by mismerge. restore original innobase version ------------------------------------------------------------		2009-12-23 15:03:51 +03:00
..
archive	Automerge the build fixes of 5.5.0-m2 back into the tree.	2009-12-16 14:11:20 +01:00
blackhole	Manual merge from mysql-trunk-merge.	2009-11-05 23:28:35 +03:00
csv	Merge from mysql-next-mr.	2009-10-23 15:22:21 +04:00
example	Auto-merge from mysql-next-mr.	2009-11-05 15:08:37 +03:00
federated	Bug#47382 'mysqladmin debug' crash on 64-bit Windows	2009-11-10 13:41:43 -06:00
heap	Remove .cvsignore files (attempt #2).	2009-12-16 11:24:30 +03:00
ibmdb2i	Manual merge from mysql-trunk.	2009-12-22 09:31:24 +03:00
innobase	Backporting fix for Bug#49834 from mysql-next-mr-bugfixing	2009-12-23 15:03:51 +03:00
myisam	Automerge from mysql-5.1-bugteam to mysql-trunk-merge.	2009-12-17 18:09:04 +03:00
myisammrg	Remove .cvsignore files (attempt #2).	2009-12-16 11:24:30 +03:00
ndb	Manual merge from mysql-trunk-merge.	2009-11-06 17:20:27 +03:00
Makefile.am	Backport WL#3653 to 5.1 to enable bundled innodb plugin.	2009-06-10 10:59:49 +02:00
mysql_storage_engine.cmake	WL#4903 Plugin Service API part I	2009-11-02 21:05:42 +01:00