summaryrefslogtreecommitdiff
path: root/mysql-test/lib
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-252-1/+12
* merge.Sergei Golubchik2010-11-2515-483/+627
|\
| * merge with 5.1Sergei Golubchik2010-10-255-12/+32
| |\
| | * 5.1.51 mergeSergei Golubchik2010-10-195-12/+32
| | |\
| * | | rename maria to ariaSergei Golubchik2010-09-121-15/+15
| * | | merge with 5.1Sergei Golubchik2010-09-114-64/+78
| |\ \ \ | | |/ /
| | * | Automatic mergeMichael Widenius2010-09-062-2/+2
| | |\ \
| | | * | Fixed bug that 'maria_read_log -a' didn't set max_trid when reparing tables.Michael Widenius2010-09-061-1/+1
| | | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-1/+1
| | | |\ \
| | * | | | make the check for windowsSergei Golubchik2010-08-301-1/+1
| | * | | | typo fixedSergei Golubchik2010-08-291-1/+1
| | * | | | use the correct path separator on windows.Sergei Golubchik2010-08-271-2/+5
| | |/ / /
| | * | | mtr changes:Sergei Golubchik2010-08-251-61/+72
| * | | | Automerge with 5.1Michael Widenius2010-08-258-271/+155
| |\ \ \ \ | | |/ / /
| | * | | allow suite.pm to tell mtr to skip the suiteSergei Golubchik2010-08-241-0/+7
| | * | | generalization of mtr to support suite.pm extensions:Sergei Golubchik2010-08-178-273/+150
| * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-054-5/+72
| |\ \ \ \ | | |/ / /
| | * | | Fixes to allow one to compile and test innodb_pluginMichael Widenius2010-08-041-1/+43
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-023-3/+28
| | |\ \ \
| | * | | | Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or...Michael Widenius2010-07-301-1/+1
| * | | | | mergeSergei Golubchik2010-06-142-50/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | fixed for mysql-test-run toSergei Golubchik2010-06-102-49/+4
| * | | | | merge 5.1->5.2Sergei Golubchik2010-06-0110-231/+188
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-82/+43
| | |\ \ \ \
| | * \ \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-2810-152/+148
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge Oqgraph with MariaDB 5.2 trunkunknown2010-04-091-33/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed race condition in safe_process.cc which may have caused some mysqltests...Michael Widenius2010-04-081-33/+14
| * | | | | | | automergeunknown2010-03-304-11/+61
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Removed compiler warningMichael Widenius2010-03-301-3/+41
| | * | | | | | Fixed compiler warnings and sporadic failures in test casesMichael Widenius2010-03-282-2/+2
| | * | | | | | Fix some compiler warnings seen in Buildbot.unknown2010-03-101-4/+10
| | * | | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-2/+4
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge with MySQL 5.1.42Michael Widenius2010-01-151-0/+4
| | |\ \ \ \ \ \ \
| * | | | | | | | | Test skip due to missing OQGraph early, avoiding errors in log when starting ...unknown2010-01-041-0/+11
| |/ / / / / / / /
| * | | | | | | | Fix forHakan Kuecuekyilmaz2009-12-091-0/+1
| * | | | | | | | Fix some compiler warnings.unknown2009-12-061-11/+1
| * | | | | | | | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable...Michael Widenius2009-12-031-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge with MySQL 5.1, with following additions:Michael Widenius2009-11-118-66/+151
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | After-merge fixes following Merge of Mysql 5.1.41 into MariaDB: Fix path for ...unknown2009-11-251-2/+1
| * | | | | | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-168-65/+150
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| * | | | | | | | | Merge 5.1-release branch into MariaDB trunk.unknown2009-11-061-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix running test suite from installed package.unknown2009-11-051-0/+4
| * | | | | | | | | | Automatic merge with 5.1-mergeMichael Widenius2009-10-142-1/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge.unknown2009-10-081-0/+12
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt fil...Sergey Petrunya2009-10-081-0/+12
| | * | | | | | | | | | Fixes for package name change mysql -> mariadb.unknown2009-10-082-1/+3
| | |/ / / / / / / / /
| * | | | | | | | | | MBug#443014: Too many 'skipped' messages in mysql-test-rununknown2009-10-051-0/+12
| |/ / / / / / / / /
| * | | | | | | | | Merge MySQL-5.1.38 and XtraDB-7 into MariaDB.unknown2009-09-2511-167/+336
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Apply the following MySQL's fix:Sergey Petrunya2009-09-181-10/+20
| | * | | | | | | | | MySQL 5.1.38 merge into MariaDB.unknown2009-09-151-1/+2
| | |\ \ \ \ \ \ \ \ \