summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* post-merge changes to the mysql-test suiteSergei Golubchik2011-10-195-27/+9
* merge with 5.3Sergei Golubchik2011-10-1934-1898/+669
|\
| * Removed settings of 'derived_merge' to 'on' in ps tests.Igor Babaev2011-07-221-3/+0
| * Made the optimizer switches 'derived_merge' and 'derived_with_keys'Igor Babaev2011-07-211-1/+3
| * BUG#778434 Wrong result with in_to_exists=on in maria-5.3-mwl89Sergey Petrunya2011-07-141-0/+29
| * merge with 5.1-microSergei Golubchik2011-06-071-0/+29
| |\
| | * revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-0/+29
| * | Fix compile errors and warnings and test errors introduced by microseconds push.Vladislav Vaintroub2011-05-281-0/+1
| * | Merge with 5.1-microsecondsMichael Widenius2011-05-282-19/+128
| |\ \ | | |/
| | * post-review changes 1Sergei Golubchik2011-05-191-0/+1
| | * lp:743017 Diverging results with TIME(3) and ranges depending on the executio...Sergei Golubchik2011-03-291-2/+3
| | * wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-012-19/+124
| * | Merge with 5.3 mainMichael Widenius2011-05-162-1/+154
| |\ \
| | * \ MWL#89 - Automatic merge with 5.3unknown2011-05-102-1/+154
| | |\ \
| | | * \ MWL#89unknown2011-05-022-1/+154
| | | |\ \
| | | | * \ MWL#89unknown2011-04-012-1/+154
| | | | |\ \
| | | | | * \ MWL#89unknown2011-03-302-1/+154
| | | | | |\ \
| | | | | | * \ MWL#89unknown2011-03-012-1/+154
| | | | | | |\ \
| | | | | | | * \ Merge MWL#89 into 5.3 main.unknown2011-01-112-1/+154
| | | | | | | |\ \
| | | | | | | | * | - Fixed innodb_mysql_lock2 test failure because the test did notunknown2010-11-191-1/+2
| | | | | | | | * | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-11-051-0/+152
| | | | | | | | |\ \
| | | | | | | | | * | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-10-231-6/+6
| | | | | | | | | * | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-10-201-0/+152
| * | | | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-1012-46/+193
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-0312-53/+193
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-0212-53/+193
| | | |\ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-034-5/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-034-5/+14
| * | | | | | | | | | | | Merge various replication-related patches into MariaDB 5.3:unknown2011-04-083-2/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-0176-1590/+3378
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-103-2/+28
| * | | | | | | | | | | | merge LP BUG#68606Vladislav Vaintroub2011-03-302-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | LP686006 : maria recovery tests fail.Vladislav Vaintroub2011-03-302-0/+2
| * | | | | | | | | | | Merge with 5.2Michael Widenius2011-03-0974-859/+3375
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | / / / / / | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Automatic merge with 5.1Michael Widenius2011-03-081-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | / / / / / / | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Don't check if LAST_IO_Error has changed as this is not a user variable and i...Michael Widenius2011-03-081-0/+1
| | * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2874-859/+3374
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Disable variables-big with debug binaries.Vladislav Vaintroub2011-02-271-0/+6
| | | * | | | | | | Merge with xtradb code changesMichael Widenius2011-02-221-1/+2
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge with MySQL 5.1.55Michael Widenius2011-02-2073-858/+3366
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge with mainMichael Widenius2011-02-225-736/+12
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge in new handler and handlersocket code into 5.3 mainMichael Widenius2011-02-225-736/+12
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge with 5.1Michael Widenius2011-01-115-810/+22
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Automatic merge with 5.1Michael Widenius2011-01-101-731/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | - Fixed that Aria works with HANDLER commandsMichael Widenius2011-01-101-731/+0
| | | | * | | | | | | | | Merge with 5.1Michael Widenius2011-01-051-0/+4
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | / / / / / / | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Speed up `mtr --parallel=<lots>` by scheduling some slow tests earlier.unknown2011-01-031-0/+4
| | | | * | | | | | | | virtual columns:Sergei Golubchik2010-12-312-4/+7
| | | * | | | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-042-2/+76
| * | | | | | | | | | | Fix remaining 5.2 buildbot problems:Vladislav Vaintroub2011-02-211-1/+1
| |/ / / / / / / / / /