summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* merge mysql-5.1 --> mysql-5.5Alfranio Correia2011-01-311-4/+4
|\
| * 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
* | | Merge fix for bug 56817 from mysql-5.1 to mysql-5.5.John H. Embretsen2011-01-292-0/+92
|\ \ \ | |/ /
| * | 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#56895 part 1 of 2: Backport of revid holyfoot@mysql.com-20100823084827-js...John H. Embretsen2011-01-141-1/+1
* | | | merge from 5.5 mainBjorn Munch2011-01-194-0/+49
|\ \ \ \
| * \ \ \ Manual mergeLibing Song2011-01-194-0/+49
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#58546 test rpl_packet timeout failure sporadically on PBLibing Song2011-01-194-0/+49
| | |/ /
* | | | upmerge undo of 59063Bjorn Munch2011-01-182-12/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug #59063 rpl_migration_crash_safe fails on WindowsBjorn Munch2011-01-182-12/+2
| |/
* | Automerge from bug branch into latest mysql-5.5.Luis Soares2011-01-141-0/+3
|\ \
| * | BUG#59444: rpl_row_show_relaylog_events fails on daily-5.5 test runsLuis Soares2011-01-121-0/+3
* | | merged BUG#59063 (backport from trunk) from 5.1 to 5.5Sven Sandberg2011-01-142-2/+12
|\ \ \ | | |/ | |/|
| * | BUG#59063: rpl_migration_crash_safe fails on WindowsSven Sandberg2011-01-142-2/+12
* | | Bug#54820: master_connect_retry increased for Valgrind environment supportSerge Kozlov2011-01-141-1/+21
* | | Bug #58841 Generalise handling of plugins in MTR mysql-test-run.pl scriptBjorn Munch2011-01-111-0/+41
| |/ |/|
* | Some if simplifications in testsBjorn Munch2010-12-2014-34/+31
|\ \
| * \ new merge from 5.5Bjorn Munch2010-12-206-3/+95
| |\ \
| * | | some more if stmt simplificationsBjorn Munch2010-12-173-12/+12
| * | | merge from 5.5 mainBjorn Munch2010-12-178-3/+357
| |\ \ \
* | \ \ \ Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.Sven Sandberg2010-12-1970-901/+3375
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | BUG#49978: Replication tests don't clean up replication state at the endSven Sandberg2010-12-1970-842/+3288
* | | | BUG#46166Luis Soares2010-12-072-2/+25
|\ \ \ \ | |/ / /
| * | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error Luis Soares2010-11-302-2/+25
| * | | merge from 5.1-mtrBjorn Munch2010-11-271-6/+2
| |\ \ \
* | \ \ \ merge from 5.5-mtrBjorn Munch2010-11-271-6/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | upmerge 58515Bjorn Munch2010-11-261-6/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #58515 Tests: use use exec echo, not write_file to write mysqld.1.expectBjorn Munch2010-11-261-6/+2
| | * | | merge from 5.1 up to rev 3471Bjorn Munch2010-11-142-0/+6
| | |\ \ \
* | | \ \ \ Merging from mysql-5.1-bugteamAlexander Barkov2010-11-261-0/+46
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8Alexander Barkov2010-11-261-0/+46
| * | | | | merge from 5.1-mtrBjorn Munch2010-10-2512-23/+23
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Follow-up to Bug #55582 which allows checking strings in ifBjorn Munch2010-10-2112-23/+23
| * | | | | Bug#56423: Different count with SELECT and CREATE SELECT queriesMartin Hansson2010-10-071-0/+52
| * | | | | merge from 5.1-mtrBjorn Munch2010-10-031-1/+1
| |\ \ \ \ \ | | |/ / / /
* | | | | | Bug#57737 Character sets: search fails with like, contraction, indexAlexander Barkov2010-11-262-0/+23
| |_|_|_|/ |/| | | |
* | | | | Bug#58190 BETWEEN no longer uses indexes for date or datetime fieldsAlexander Barkov2010-11-191-0/+15
* | | | | merge from 5.5-mtrBjorn Munch2010-11-1919-30/+52
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Tests: many if/while expresissons simplified after 57276Bjorn Munch2010-11-1719-30/+52
| * | | | merge from 5.5Bjorn Munch2010-11-145-9/+155
| |\ \ \ \
* | | | | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-114-3/+314
* | | | | | merge from 5.5-mtrBjorn Munch2010-10-2612-22/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert simplified if() in mysql-test/include/show_events.incBjorn Munch2010-10-251-1/+3
| * | | | | merge from 5.5Bjorn Munch2010-10-211-0/+6
| |\ \ \ \ \
| * \ \ \ \ \ upmerge and adapt follow-up to 55582Bjorn Munch2010-10-2112-23/+23
| |\ \ \ \ \ \
| | * | | | | | Follow-up to Bug #55582 which allows chaecking strings in ifBjorn Munch2010-10-2012-23/+23
| | | |_|_|/ / | | |/| | | |
| | * | | | | merge from 5.1Bjorn Munch2010-09-293-13/+44
| | |\ \ \ \ \