summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* mergeSergei Golubchik2011-10-111-0/+2
|\
| * merge with 5.1Sergei Golubchik2011-10-071-0/+2
| |\
| | * tests for feedback plugin,Sergei Golubchik2011-10-041-0/+2
| | * Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2Vladislav Vaintroub2011-05-042-0/+2
* | | 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
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | mtr: cleaned up some superfluos global warning suppressionsBjorn Munch2011-03-302-45/+5
| | | * | | | | | | | | Bug #11762804 55442: MYSQLD DEBUG CRASHES WHILE RUNNING MYISAM_CRASH_BEFORE_F...Bjorn Munch2011-03-151-0/+24
| | | * | | | | | | | | Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION UNEXPE...Bjorn Munch2011-02-231-1/+0
| | | * | | | | | | | | Fix for Bug#59837 - mysqlhotcopy fails with wrong error (11) on specific plat...John H. Embretsen2011-02-081-1/+1
| | | * | | | | | | | | BUG#59147: Automerged bzr bundle form bug report into mysql-5.1 .Luis Soares2011-02-041-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | BUG#59147: rpl_circular_for_4_hosts fails sporadicallyLuis Soares2011-02-031-1/+1
| | | * | | | | | | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 ||Dmitry Lenev2011-02-021-0/+16
| | | |/ / / / / / / / /
| | | * | | | | | | | | merge mysql-5.1 (local) --> mysql-5.1Alfranio Correia2011-01-311-4/+4
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | BUG#59338 Inconsistency in binlog for statements that don't change any rows S...Alfranio Correia2011-01-281-4/+4
| | | * | | | | | | | | | Fix for Bug#56817 - mysqlhotcopy tests fail when DBI and DBD-mysql perl modul...John H. Embretsen2011-01-292-0/+92
| | | |/ / / / / / / / /
| | | * | | | | | | | | Merge two patches for bug 56895 into tip of mysql-5.1 branch.John H. Embretsen2011-01-276-12/+51
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ merge from 5.1 mainBjorn Munch2011-01-194-0/+49
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Bug#58546 test rpl_packet timeout failure sporadically on PBLibing Song2011-01-194-0/+49
| | | | * | | | | | | | | | Bug #59063 rpl_migration_crash_safe fails on WindowsBjorn Munch2011-01-182-12/+2
| | | | |/ / / / / / / / /
| | | * | | | | | | | | | Bug#56895 part 1 of 2: Backport of revid holyfoot@mysql.com-20100823084827-js...John H. Embretsen2011-01-141-1/+1
| | | |/ / / / / / / / /
| | | * | | | | | | | | BUG#59063: rpl_migration_crash_safe fails on WindowsSven Sandberg2011-01-142-2/+12
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | / / / / / / | |_|_|_|_|/ / / / / / |/| | | | | | | | | |