unknown
a6c7c53b63
Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5
2011-12-15 10:34:14 +01:00
Sergei Golubchik
d2755a2c9c
5.3->5.5 merge
2011-11-22 18:04:38 +01:00
Sergei Golubchik
4e46d8e5bf
merge with xtradb-5.5.15
...
fix test cases
2011-07-18 23:04:24 +02:00
Igor Babaev
6dab04bda0
Merge.
2011-06-01 20:49:37 -07:00
Igor Babaev
deb3b9a174
Downported InnoDB support of Index Condition Pushdown from MySQL-5.6 code line.
2011-05-25 16:01:56 -07:00
unknown
8b046db411
Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.
2011-04-29 16:16:42 +02:00
Michael Widenius
1392eba62a
Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradb
...
mysql-test/r/innodb-zip.result:
File has been moved to suite/innodb_plugin
mysql-test/t/innodb-zip.test:
File has been moved to suite/innodb_plugin
2011-02-22 19:24:24 +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
b3ecd24523
Merge XtraDB from Percona-Server 5.1.52-11.6 into MariaDB 5.1
...
revid:oleg.tsarev@percona.com-20101118145125-wjhjrb5jwhi0g7sj
2010-11-24 14:04:38 +01:00
unknown
462d14d42b
Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.
2010-10-19 17:03:26 +02:00
Sergei Golubchik
745cc74c33
5.1.51 merge
2010-10-19 15:58:35 +02:00
unknown
c6ccd3f346
Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.
2010-10-19 14:16:15 +02: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
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
