summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
Commit message (Expand)AuthorAgeFilesLines
* Merge MDEV-5754, MDEV-5769, and MDEV-5764 into 10.0unknown2014-03-041-0/+0
|\
| * MDEV-5769: Slave crashes on attempt to do parallel replication from an older ...unknown2014-03-041-0/+0
* | 10.0-base mergeSergei Golubchik2014-02-267-246/+242
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-257-246/+242
| |\ \ | | |/ | |/|
| | * MDEV-5609 create new test ssl certificatesSergei Golubchik2014-02-197-246/+242
* | | 10.0-base mergeSergei Golubchik2014-02-033-0/+0
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-02-013-0/+0
| |\ \ | | |/
| | * Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-223-0/+0
* | | 10.0-base mergeSergei Golubchik2013-12-161-0/+0
|\ \ \ | |/ /
| * | Merge 5.5->10.0-baseAlexander Barkov2013-11-211-0/+0
| |\ \ | | |/
| | * 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-5297 TIME(0), TIMESTAMP(0) and DATETIME(0) are self-incompatible during ...Alexander Barkov2013-12-066-0/+0
* | | | | | Fixing malformed data in mysql-test/std_data/Index.xmlAlexander Barkov2013-11-261-7/+7
* | | | | | Merging xxx_unicode_520_ci and xxx_vietnamese_ci from MySQL-5.6.Alexander Barkov2013-11-121-2/+12
* | | | | | MDEV-5241: Collation incompatibilities with MySQL-5.6Michael Widenius2013-11-0915-0/+0
* | | | | | A few minor Unicode collation customization improvements were made,Alexander Barkov2013-10-311-1/+13
* | | | | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6Alexander Barkov2013-10-232-0/+22
* | | | | | MDEV-4928 Merge collation customization improvements Alexander Barkov2013-10-021-0/+962
* | | | | | 10.0-base merge.Sergei Golubchik2013-09-219-5/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5.33a mergeSergei Golubchik2013-09-204-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB releaseSergei Golubchik2013-09-184-0/+0
| * | | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-182-5/+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
| * | | | | MDEV-4645: Incorrect reads of frozen binlog events; FDE corrupted in relay logunknown2013-09-124-0/+0
* | | | | | MDEV-4819 Upgrade from MySQL 5.6 does not workAlexander Barkov2013-08-0749-0/+4
* | | | | | MDEV-4786 - merge 10.0-monty - 10.0Sergey Vojtovich2013-07-293-0/+0
* | | | | | Adding support for MySQL-5.6 temporal column types:Alexander Barkov2013-07-109-0/+0
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-0/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-0/+13
| |/ / / /
* | | | | MDEV-3816 init-file stops getting executed if a long enough line is encounter...Sergei Golubchik2012-12-161-0/+8
* | | | | more fixes for test casesSergei Golubchik2012-10-015-0/+217
* | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-142-0/+20
|/ / / /
* | | | 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
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |