summaryrefslogtreecommitdiff
path: root/storage/xtradb
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | Automerge mariadb 5.1 -> mariadb 5.2unknown2010-05-052-1/+4
|\ \ \ | |/ /
| * | Fix a bunch of Windows warningsBo Thorsen2010-04-212-1/+4
* | | Merge with 5.1Michael Widenius2010-04-081-1/+1
|\ \ \ | |/ /
| * | Removed compiler warningsMichael Widenius2010-04-071-1/+1
* | | Maria WL#61unknown2010-04-013-0/+738
* | | Auto merge with 5.1Michael Widenius2010-04-012-2/+0
|\ \ \ | |/ /
| * | Added missing space from last pushMichael Widenius2010-03-312-2/+0
* | | Merge with 5.1Michael Widenius2010-04-013-3/+3
|\ \ \ | |/ /
| * | Removed compiler warningMichael Widenius2010-03-301-1/+1
| * | Fixed compiler warnings and sporadic failures in test casesMichael Widenius2010-03-283-3/+3
| |/
* | mergedSergei Golubchik2010-03-151-1/+1
|\ \ | |/
| * Fix some compiler warnings seen in Buildbot.unknown2010-03-101-1/+1
* | merge 5.1->5.2unknown2010-02-01122-2962/+5078
|\ \ | |/
| * Merge with fixes for compiler warnings and 2 fixed test casesMichael Widenius2010-01-282-5/+5
| * Fixed race condition when innobase_shutdown_for_mysql() was called before par...Michael Widenius2010-01-172-4/+8
| * Fix freed-twice error in XtraDB (from InnoDB plugin 1.0.6).unknown2010-01-171-1/+1
| * Apply to XtraDB MySQL/build-in innodb patches for Bug#49032 and Bug#47720.unknown2010-01-152-15/+39
| * Fix crashes by taking kernel mutex when calling srv_table_reserve_slot() duri...unknown2010-01-151-4/+3
| * After-merge fix for XtraDB 9: missing DBUG_RETURN.unknown2010-01-151-1/+1
| * Merge XtraDB 9 into MariaDB.unknown2010-01-15121-2934/+5016
| * Fix for compiler warnings on windowsMichael Widenius2010-01-141-0/+2
| * Merged patch from Percona to get proper fix for compilation issue of srv0srv....Michael Widenius2010-01-121-5/+9
| * Removed compiler warningsMichael Widenius2010-01-061-6/+7
* | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-062-3/+4
* | merge 5.1-> 5.2unknown2009-12-08305-27747/+32159
|\ \ | |/
| * Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-304-27/+156
| |\
| | * Merge with MySQL 5.1, with following additions:unknown2009-11-164-28/+157
| * | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-302-2/+2
| * | XtraDB 8 after-merge fix: Fix windows build.unknown2009-11-141-1/+1
| * | XtraDB 8 after-merge fix: Add missing header to `make dist`.unknown2009-11-131-0/+1
| * | Merge XtraDB 8 into MariaDB.unknown2009-11-13305-27718/+32000
| |/
* | MergeIgor Babaev2009-11-093-29/+29
|\ \ | |/
| * Compilation under windows x64 made possible.unknown2009-10-312-28/+28
| * Added federatedx storage engineMichael Widenius2009-10-301-1/+1
* | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-162-31/+43
|/
* Fix of bug #417751 by Yasufumi Kinoshita.Igor Babaev2009-09-161-2/+14