10 commits

Author	SHA1	Message	Date
Sergei Golubchik	ffc8f62b08	merge 5.1->5.2	2010-06-01 21:52:20 +02:00
unknown	9f9629ca82	Merge XtraDB 10 into MariaDB.	2010-04-28 16:35:00 +02:00
unknown	e5099a2c85	merge 5.1->5.2	2010-02-01 08:14:12 +02:00
unknown	13029651b5	Merge XtraDB 9 into MariaDB.	2010-01-15 16:58:25 +01:00
unknown	08e4635fba	merge 5.1-> 5.2	2009-12-08 23:47:54 +02:00
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
Igor Babaev	f7a75b999b	The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. ... The original patch has been ameliorated by Sanja and Igor.	2009-10-16 15:57:48 -07:00
unknown	a6b7f71329	Import Percona XtraDB into the MariaDB source tree.	2009-06-09 13:16:11 +02:00