Sergei Golubchik
0d9a6d52d7
merge with XtraDB as of Percona-Server-5.5.30-rel30.1
2013-03-08 19:08:45 +01:00
Sergei Golubchik
9d72bbf84c
merge with XtraDB as of Percona-Server-5.5.29-rel30.0
2013-02-28 23:56:17 +01:00
Sergei Golubchik
6af914f8b9
XtraDB from Percona-Server-5.5.27-rel28.1
2012-09-05 13:14:37 +02:00
Sergei Golubchik
37f5632212
merged with XtraDB 1.1.8-26.0
2012-06-15 14:54:23 +02:00
Sergei Golubchik
44cf9ee5f7
5.3 merge
2012-05-04 07:16:38 +02:00
Vladislav Vaintroub
66a64adb3e
Xtradb recently started to access thd members directly ,e.g thd->stmt_da (ha_innodb.cc)
...
It needs recompilation for embedded server, as layout of THD is different in embedded.
2012-01-26 16:06:08 +01:00
unknown
a6c7c53b63
Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5
2011-12-15 10:34:14 +01:00
unknown
ec889cd2e2
Merge XtraDB from Percona-Server-5.1.59-13 into MariaDB 5.1.
2011-11-21 14:21:13 +01:00
Sergei Golubchik
4e46d8e5bf
merge with xtradb-5.5.15
...
fix test cases
2011-07-18 23:04:24 +02:00
Sergei Golubchik
0accbd0364
lots of post-merge changes
2011-04-25 17:22:25 +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
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
a6b7f71329
Import Percona XtraDB into the MariaDB source tree.
2009-06-09 13:16:11 +02:00
