summaryrefslogtreecommitdiff
path: root/storage/xtradb
Commit message (Expand)AuthorAgeFilesLines
* remove unused autotools filesSergei Golubchik2011-07-032-576/+0
* lots of post-merge changesSergei Golubchik2011-04-2512-66/+68
* merge.Sergei Golubchik2010-11-251-32/+198
* Automerge with 5.2Michael Widenius2010-11-057-12/+57
|\
| * Automatic merge with MariaDB 5.1Michael Widenius2010-11-045-10/+55
| |\
| | * MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge threadunknown2010-11-035-10/+55
| * | Automatic merge with 5.1Michael Widenius2010-11-042-2/+2
| |\ \ | | |/
| | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-022-2/+2
* | | 5.2 mergeSergei Golubchik2010-10-2846-298/+1058
|\ \ \ | |/ /
| * | merge with 5.1Sergei Golubchik2010-10-2546-293/+1053
| |\ \ | | |/
| | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-1935-278/+785
| | |\
| | | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-1946-294/+1054
| | * | 5.1.51 mergeSergei Golubchik2010-10-1923-86/+339
| | |/
* | | Merge 5.2->5.3Sergey Petrunya2010-10-10124-2768/+8872
|\ \ \ | |/ /
| * | fix incorrect xtradb plugin metadata.Sergei Golubchik2010-09-111-2/+2
| * | merge with 5.1Sergei Golubchik2010-09-1183-1138/+3083
| |\ \ | | |/
| | * build dynamic plugins with the -shared libtool option to avoidSergei Golubchik2010-09-091-2/+2
| | * Fixed compiler warningsMichael Widenius2010-09-071-2/+2
| | * Fix compile failures and warnings on Windows from XtraDB "shm buffer pool" pa...unknown2010-09-067-43/+47
| | * Added missing include file (to get rid of compiler warning)Michael Widenius2010-09-061-0/+1
| | * Fixed failing test cases after update of xtradbMichael Widenius2010-09-051-2/+2
| | * Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-0382-1136/+3057
| * | Automerge with 5.1Michael Widenius2010-08-254-8/+8
| |\ \ | | |/
| | * Fixed compiler warnings from Windows compilerMichael Widenius2010-08-114-8/+8
| * | Merge with 5.2Michael Widenius2010-08-091-1/+1
| |\ \ | | |/
| | * Ensure that xtradb & InnoDB plugin compiles if valgrind is installed but not ...Michael Widenius2010-08-071-1/+1
| * | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-5/+5
| * | Merge with MariaDB 5.1.49Michael Widenius2010-08-0594-1639/+5792
| |\ \ | | |/
| | * Merge with 5.1-merge (new XTRADB code updated up to MySQL 5.1.47)Michael Widenius2010-08-0594-1638/+5790
| | |\
| | | * Fixed compiler warningsMichael Widenius2010-08-043-2/+11
| | | * Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-0494-1636/+5781
| | * | Fixed some test failures after last push (failing tests and valgrind warnings)Michael Widenius2010-08-041-2/+3
| | * | Fixes to allow one to compile and test innodb_pluginMichael Widenius2010-08-041-2/+2
| | |/
| * | buildbot detected problemsSergei Golubchik2010-07-241-1/+1
| * | Automerge MariaDB 5.1->5.2.unknown2010-07-092-5/+7
| |\ \ | | |/
| | * Fix bug 600744Bo Thorsen2010-07-022-5/+7
| * | mergeSergei Golubchik2010-06-145-31/+31
| |\ \ | | |/
| | * ugly-ugly. $with_plugin_innobase was hard-coded in configure.in inSergei Golubchik2010-06-101-1/+2
| | * allow federated and innodb_plugin to be builtSergei Golubchik2010-06-094-26/+25
| | * fix questionable UNIV_EXPECT's in the xtradb that confused old gcc.Sergei Golubchik2010-06-091-4/+4
* | | Let xtradb set mrr_length_per_rec stats.Sergey Petrunya2010-08-091-0/+1
* | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-26170-201/+34075
|\ \ \ | |/ /
| * | after merge fix.Sergei Golubchik2010-06-073-0/+39
| * | merge 5.1->5.2Sergei Golubchik2010-06-01166-196/+33292
| |\ \ | | |/
| | * Fixed compiler warningsMichael Widenius2010-05-271-2/+2
| | * Merge 5.1.44a security release + fix a couple compiler warnings.unknown2010-04-301-8/+11
| | |\
| | * | After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and...unknown2010-04-286-9/+5
| | * | Merge XtraDB 10 into MariaDB.unknown2010-04-2847-147/+1749
| | * | Merge XtraDB 9.1 into MariaDB.unknown2010-04-28124-84/+31576
| | * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-6/+10