5 commits

Author	SHA1	Message	Date
unknown	db260b19e3	Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. ... Also merge charset patch.	2009-11-30 22:37:27 +01:00
unknown	a962160eec	Merge with MySQL 5.1, with following additions: ... - Moved some code from innodb_plugin to xtradb, to ensure that all tests runs - Did changes in pbxt and maria storage engines becasue of changes in thd->query - Reverted wrong code in sql_table.cc for how ROW_FORMAT is used. This is a re-commit of Monty's merge to eliminate an extra commit from MySQL-5.1.42 that was accidentally included in the merge. This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In case there are any extra changes done before final MySQL 5.1.41 release, these will need to be merged later before MariaDB 5.1.41 release.	2009-11-16 21:49:51 +01:00
unknown	898f6f48b7	Merge XtraDB 8 into MariaDB.	2009-11-13 22:26:08 +01:00
unknown	cb6a28aaf9	Merge XtraDB 6 into MariaDB.	2009-08-03 22:09:53 +02:00
unknown	a6b7f71329	Import Percona XtraDB into the MariaDB source tree.	2009-06-09 13:16:11 +02:00