summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.3 -> 5.5Alexander Barkov2013-11-131-0/+0
|\
| * Merge 5.2 -> 5.3Alexander Barkov2013-11-131-0/+0
| |\
| | * Merge 5.1 -> 5.2Alexander Barkov2013-11-131-0/+0
| | |\
| | | * MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and aboveAlexander Barkov2013-11-131-0/+0
* | | | MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB releaseSergei Golubchik2013-09-184-0/+0
* | | | MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB releaseSergei Golubchik2013-09-181-0/+0
* | | | remove PBXTSergei Golubchik2013-08-301-5/+0
* | | | Merge 5.3->5.5Igor Babaev2012-03-171-0/+0
|\ \ \ \ | |/ / /
| * | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"Michael Widenius2012-03-131-0/+0
* | | | 5.3 mergeSergei Golubchik2012-01-132-1/+3
|\ \ \ \ | |/ / /
| * | | Merge with 5.2Michael Widenius2011-12-141-0/+2
| |\ \ \ | | |/ /
| | * | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETEMichael Widenius2011-12-131-0/+2
| * | | Merge with 5.2.Michael Widenius2011-12-112-3/+4
| |\ \ \ | | |/ /
| | * | Merge with MariaDB 5.1Michael Widenius2011-11-242-3/+4
| | |\ \ | | | |/
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-212-3/+4
| | | |\
* | | | \ mysql-5.5.18 mergeSergei Golubchik2011-11-033-97/+3
|\ \ \ \ \
| * | | | | Bug#11747416 : 32228 A disk full makes binary log corruptAndrei Elkin2011-09-291-0/+0
| * | | | | Bug #11766328 59417: TEST BUGS.BUG57108 IS BROKEN:.....Bjorn Munch2011-07-221-95/+0
| * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | |\ \ \ \
* | | \ \ \ \ merge with 5.3Sergei Golubchik2011-10-191-0/+66
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-0/+97
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+97
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+97
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| * | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-101-0/+66
| |/ / / / /
* | | | | | 5.5-mergeSergei Golubchik2011-07-027-0/+192
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | MergeMagnus Blåudd2011-03-253-0/+0
| |\ \ \ \ \
| | * | | | | Bug#60111 storage type for table not saved in .frmMagnus Blåudd2011-03-043-0/+0
| * | | | | | Bug #11755431 (former 47205)Jon Olav Hauglid2011-03-081-0/+0
| |/ / / / /
| * | | | | Merge fix for bug 56817 from mysql-5.1 to mysql-5.5.John H. Embretsen2011-01-291-0/+97
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fix for Bug#56817 - mysqlhotcopy tests fail when DBI and DBD-mysql perl modul...John H. Embretsen2011-01-291-0/+97
| * | | | | BUG#57108: mysqld crashes when I attempt to install pluginMats Kindahl2010-11-041-0/+95
| * | | | | mergeMattias Jonsson2010-10-011-0/+0
| |\ \ \ \ \
| | * | | | | Bug#50036: Inconsistent errors when using TIMESTAMP columns/expressionsMattias Jonsson2010-08-301-0/+0
* | | | | | | merge.Sergei Golubchik2010-11-255-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | merge with 5.1Sergei Golubchik2010-10-252-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 5.1.51 mergeSergei Golubchik2010-10-192-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | merge with 5.1Sergei Golubchik2010-09-118-220/+146
| |\ \ \ \ \ | | |/ / / /
| | * | | | Enable archive tables to work with mysql_upgrade / repairMichael Widenius2010-09-036-0/+0
| | * | | | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-033-0/+0
| | * | | | Merge with MySQL 5.1.50Michael Widenius2010-08-272-220/+146
| | |\ \ \ \
| * | \ \ \ \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-0/+441
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-0/+441
| | |\ \ \ \ \
| * | \ \ \ \ \ merge 5.1->5.2Sergei Golubchik2010-06-018-0/+13
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-288-0/+13
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ mergedSergei Golubchik2010-03-159-373/+325
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-049-373/+325
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ merge 5.1->5.2unknown2010-02-019-104/+134
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Changed version number from RC to stableMichael Widenius2010-01-295-104/+129
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug #50642 ssl certs in test suite are expiring soon.Matthew Montgomery2010-01-263-112/+176