9 commits

Author	SHA1	Message	Date
unknown	8b046db411	Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.	2011-04-29 16:16:42 +02:00
unknown	1fe7f1ef24	Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.	2011-02-04 14:18:08 +01:00
unknown	c21a7a6bb2	Merge XtraDB from Percona server 5.1.49-12 into MariaDB.	2010-09-03 19:42:54 +02:00
unknown	3f1c763a94	Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.	2010-08-04 10:39:53 +02:00
unknown	9f9629ca82	Merge XtraDB 10 into MariaDB.	2010-04-28 16:35:00 +02:00
unknown	13029651b5	Merge XtraDB 9 into MariaDB.	2010-01-15 16:58:25 +01:00
unknown	898f6f48b7	Merge XtraDB 8 into MariaDB.	2009-11-13 22:26:08 +01:00
unknown	8be051d703	XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/innodb/ ... .bzrignore: XtraDB compiles innodb in storage/xtradb instead of storage/innobase CMakeLists.txt: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ libmysqld/CMakeLists.txt: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/innobase/plug.in.disabled: Disable building old InnoDB from storage/innobase/ directory. We will keep the files around to avoid getting merge conflicts for every MySQL upstream change to InnoDB. storage/xtradb/CMakeLists.txt: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/COPYING: Remove not needed file from XtraDB. storage/xtradb/Makefile.am: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/Makefile.in: Remove not needed file from XtraDB. storage/xtradb/handler/ha_innodb.cc: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/plug.in: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/row/row0ins.c: Take InnoDB code from storage/xtradb/ instead of storage/innobase/	2009-06-09 14:21:26 +02:00
unknown	a6b7f71329	Import Percona XtraDB into the MariaDB source tree.	2009-06-09 13:16:11 +02:00