Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MDEV-5754, MDEV-5769, and MDEV-5764 into 10.0 | unknown | 2014-03-04 | 1 | -0/+0 |
|\ | |||||
| * | MDEV-5769: Slave crashes on attempt to do parallel replication from an older ... | unknown | 2014-03-04 | 1 | -0/+0 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 7 | -246/+242 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 7 | -246/+242 |
| |\ \ | | |/ | |/| | |||||
| | * | MDEV-5609 create new test ssl certificates | Sergei Golubchik | 2014-02-19 | 7 | -246/+242 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 3 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 3 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 3 | -0/+0 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.5->10.0-base | Alexander Barkov | 2013-11-21 | 1 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Merge 5.3 -> 5.5 | Alexander Barkov | 2013-11-13 | 1 | -0/+0 |
| | |\ | |||||
| | | * | Merge 5.2 -> 5.3 | Alexander Barkov | 2013-11-13 | 1 | -0/+0 |
| | | |\ | |||||
| | | | * | Merge 5.1 -> 5.2 | Alexander Barkov | 2013-11-13 | 1 | -0/+0 |
| | | | |\ | |||||
| | | | | * | MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above | Alexander Barkov | 2013-11-13 | 1 | -0/+0 |
* | | | | | | MDEV-5297 TIME(0), TIMESTAMP(0) and DATETIME(0) are self-incompatible during ... | Alexander Barkov | 2013-12-06 | 6 | -0/+0 |
* | | | | | | Fixing malformed data in mysql-test/std_data/Index.xml | Alexander Barkov | 2013-11-26 | 1 | -7/+7 |
* | | | | | | Merging xxx_unicode_520_ci and xxx_vietnamese_ci from MySQL-5.6. | Alexander Barkov | 2013-11-12 | 1 | -2/+12 |
* | | | | | | MDEV-5241: Collation incompatibilities with MySQL-5.6 | Michael Widenius | 2013-11-09 | 15 | -0/+0 |
* | | | | | | A few minor Unicode collation customization improvements were made, | Alexander Barkov | 2013-10-31 | 1 | -1/+13 |
* | | | | | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 2 | -0/+22 |
* | | | | | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -0/+962 |
* | | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 9 | -5/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.5.33a merge | Sergei Golubchik | 2013-09-20 | 4 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB release | Sergei Golubchik | 2013-09-18 | 4 | -0/+0 |
| * | | | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 2 | -5/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB release | Sergei Golubchik | 2013-09-18 | 1 | -0/+0 |
| | * | | | | remove PBXT | Sergei Golubchik | 2013-08-30 | 1 | -5/+0 |
| * | | | | | MDEV-4645: Incorrect reads of frozen binlog events; FDE corrupted in relay log | unknown | 2013-09-12 | 4 | -0/+0 |
* | | | | | | MDEV-4819 Upgrade from MySQL 5.6 does not work | Alexander Barkov | 2013-08-07 | 49 | -0/+4 |
* | | | | | | MDEV-4786 - merge 10.0-monty - 10.0 | Sergey Vojtovich | 2013-07-29 | 3 | -0/+0 |
* | | | | | | Adding support for MySQL-5.6 temporal column types: | Alexander Barkov | 2013-07-10 | 9 | -0/+0 |
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -0/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -0/+13 |
| |/ / / / | |||||
* | | | | | MDEV-3816 init-file stops getting executed if a long enough line is encounter... | Sergei Golubchik | 2012-12-16 | 1 | -0/+8 |
* | | | | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 5 | -0/+217 |
* | | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 2 | -0/+20 |
|/ / / / | |||||
* | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -0/+0 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 2 | -1/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.2 | Michael Widenius | 2011-12-14 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE | Michael Widenius | 2011-12-13 | 1 | -0/+2 |
| * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 2 | -3/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 2 | -3/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 2 | -3/+4 |
| | | |\ | |||||
* | | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 3 | -97/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#11747416 : 32228 A disk full makes binary log corrupt | Andrei Elkin | 2011-09-29 | 1 | -0/+0 |
| * | | | | | Bug #11766328 59417: TEST BUGS.BUG57108 IS BROKEN:..... | Bjorn Munch | 2011-07-22 | 1 | -95/+0 |
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -0/+66 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | |