Sergei Golubchik
b3f4cf7c13
Merge branch 'merge-xtradb-5.6' into 0.0
2016-06-21 15:27:09 +02:00
Sergei Golubchik
b42664e85e
5.6.30-76.3
2016-06-21 14:20:09 +02:00
Sergei Golubchik
cfad394776
Merge branch 'merge-xtradb-5.6' into 10.0
...
5.6.29-76.2
2016-04-26 23:43:48 +02:00
Sergei Golubchik
5b8ac23030
5.6.29-76.2
2016-04-26 19:07:11 +02:00
Sergei Golubchik
17a792a441
Merge branch 'merge-xtradb-5.6' into 10.0
2016-02-16 18:55:00 +01:00
Sergei Golubchik
d76eba6a6b
5.6.28-76.1
2016-02-16 12:06:16 +01:00
Sergei Golubchik
359ae59ac0
Merge branch 'merge/merge-xtradb-5.6' into 10.0
2015-12-13 16:23:02 +01:00
Sergei Golubchik
1e270d504d
5.6.27-76.0
2015-12-13 10:13:18 +01:00
Sergei Golubchik
e7cb032e56
fixes for buildbot:
...
* update *.result files
* fix XtraDB for Windows (again)
2015-10-10 11:07:29 +02:00
Sergei Golubchik
01be663c50
Merge branch 'merge-xtradb-5.6' into 10.0
2015-10-09 18:16:27 +02:00
Sergei Golubchik
6a821d78a6
5.6.26-74.0
2015-10-09 17:20:49 +02:00
Sergei Golubchik
4f479fb13f
Merge branch 'merge-xtradb-5.6' into 10.0
...
XtraDB 5.6.25-73.1
2015-08-03 14:03:46 +02:00
Sergei Golubchik
0b3eb4559b
5.6.25-73.1
2015-08-01 15:04:20 +02:00
Sergei Golubchik
9859d366b5
Merge branch 'merge-xtradb-5.6' into 10.0
2015-06-16 12:46:14 +02:00
Sergei Golubchik
90849456d7
5.6.24-72.2
2015-06-16 11:04:40 +02:00
Sergei Golubchik
bbcc8e6924
XtraDB-5.6.23-72.1
2015-05-05 00:08:58 +02:00
Sergei Golubchik
a4416abdde
5.6.23-72.1
2015-05-04 22:17:04 +02:00
Sergei Golubchik
14a142fca6
move to storage/xtradb
2015-05-04 19:15:28 +02:00
Sergei Golubchik
174bccd3ff
xtradb 5.6.22-72.0
2015-02-18 20:31:40 +01:00
Sergei Golubchik
78e131d493
XtraDB 5.6.22-71.0
2015-01-21 14:34:58 +01:00
Sergei Golubchik
32ec8625af
XtraDB 5.6.21-70.0
2014-11-20 17:05:13 +01:00
Sergei Golubchik
4a68817d8d
XtraDB 5.6.20-68.0
2014-09-11 16:44:16 +02:00
Sergei Golubchik
a7f39aacd5
xtradb-5.6.19-67.0
2014-08-06 19:57:06 +02:00
Sergei Golubchik
a2807e41e8
xtradb 5.6.17-65.0
2014-05-07 17:33:33 +02:00
Sergei Golubchik
b968363aac
MDEV-6184 10.0.11 merge
...
XtraDB 5.6.16-64.2
2014-05-06 10:21:34 +02:00
Sergei Golubchik
ac585e9ed5
Percona-Server-5.6.15-rel63.0.tar.gz merge
2014-02-26 19:21:23 +01:00
Sergei Golubchik
ffa8c4cfcc
Percona-Server-5.6.14-rel62.0 merge
...
support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module
update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply
small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream
fix XtraDB to compile on Windows (both as a static and a dynamic plugin)
disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)
storage/innobase/handler/ha_innodb.cc:
revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
correct the version to match what it was merged from
2013-12-22 17:06:50 +01:00
Sergei Golubchik
1904a5d0cc
Percona-Server-5.5.33-rel31.1.tar.gz
2013-09-07 13:49:15 +02:00
Sergei Golubchik
da846a153b
Merge with XtraDB as of Percona-Server-5.5.30-rel30.2
2013-05-08 10:12:21 +02:00
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
cf013ff949
xtradb merge. Percona-Server-5.5.28-rel29.3
2013-01-16 11:13:08 +01:00
Sergei Golubchik
c499fa1ef3
XtraDB from Percona-Server-5.5.28-rel29.1
2012-11-22 11:43:55 +01:00
Sergei Golubchik
d9a8799205
XtraDB 1.1.8-29.0
2012-10-16 10:36:28 +02:00
Sergei Golubchik
6af914f8b9
XtraDB from Percona-Server-5.5.27-rel28.1
2012-09-05 13:14:37 +02:00
Sergei Golubchik
0af0e7a70a
merge XtraDB 1.1.8-27.0 from Percona-Server-5.5.25a-rel27.1
2012-08-22 09:56:20 +02:00
Sergei Golubchik
37f5632212
merged with XtraDB 1.1.8-26.0
2012-06-15 14:54:23 +02:00
Sergei Golubchik
13982b5a11
comments
2012-06-15 10:26:06 +02:00
unknown
4917073305
Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5.
2012-02-15 15:37:38 +01:00
Sergei Golubchik
76f0b94bb0
merge with 5.3
...
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
2011-10-19 21:45:18 +02:00
Sergei Golubchik
4e46d8e5bf
merge with xtradb-5.5.15
...
fix test cases
2011-07-18 23:04:24 +02: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
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
Michael Widenius
f6d226f5f7
Ensure that xtradb & InnoDB plugin compiles if valgrind is installed but not valgrind debug libraries
2010-08-07 19:08:59 +03:00
unknown
3f1c763a94
Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.
2010-08-04 10:39:53 +02:00
Bo Thorsen
9b703c9112
Fix bug 600744
2010-07-02 12:25:45 +02:00
