summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-151-0/+16
|\
| * BUG #28421 Infinite loop on slave relay logsunknown2010-01-081-0/+16
* | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-191-1/+1
|\ \
| * \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+1
| |\ \ | | |/
| | * Merge from 5.0-bugteamHe Zhenxing2009-12-101-1/+1
| | |\
| | | * Post fix for bug#45520He Zhenxing2009-12-101-1/+1
* | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-0/+8
|\ \ \ \ | |/ / /
| * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1117-13/+195
| |\ \ \
| * \ \ \ Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-0/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | auto-merge bzr bundle from bug report into latest mysql-5.1-bugteam.Luis Soares2009-11-061-0/+9
| | |\ \ \
| | | * | | BUG#47743: rpl.rpl_log_pos fails sporadicallyLuis Soares2009-11-041-0/+9
* | | | | | Bug#49369: No testcase for key caches on partitionsMattias Jonsson2009-12-032-0/+15
| |_|_|/ / |/| | | |
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+4
| |\ \ \ \ | | |/ / /
| | * | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-10-271-0/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#41049 does syntax "grant" case insensitive?Sergey Glukhov2009-10-271-0/+4
| | * | | merge from 5.1 mainBjorn Munch2009-10-1610-14/+26
| | |\ \ \ | | | | |/ | | | |/|
| * | | | new merge from trunkBjorn Munch2009-10-226-2/+16
| |\ \ \ \
* | \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+4
|\ \ \ \ \ \
| * | | | | | Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error.Marc Alff2009-10-291-0/+4
* | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-2811-6/+128
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-279-6/+108
| |\ \ \ \ \ \
| | * \ \ \ \ \ automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge.Luis Soares2009-10-251-0/+7
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Auto merge 5.1-rep-semisync to 5.1-rep+2-delivery1He Zhenxing2009-10-231-0/+7
| | | |\ \ \ \ \ \
| | | | * | | | | | Skip semisync test if the plugin-dir is not set to semisync plugin dirHe Zhenxing2009-10-231-0/+7
| | * | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-229-6/+101
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-031-0/+15
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Back porting the test case for semi-syncHe Zhenxing2009-09-301-0/+15
| | | * | | | | | | Auto mergeHe Zhenxing2009-10-031-0/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | WL#4641 Heartbeat testingSerge Kozlov2009-10-021-0/+4
| | | * | | | | | | | Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190He Zhenxing2009-10-021-1/+15
| | | * | | | | | | | Backport BUG#12190 CHANGE MASTER has differ path requiremts on MASTER_LOG_FIL...He Zhenxing2009-10-021-1/+1
| | | |/ / / / / / /
| | | * | | | | | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixesAndrei Elkin2009-10-014-3/+63
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Partial backport for BUG#41399, more precisely, the changes to Luis Soares2009-10-011-1/+1
| | | | * | | | | | | Bug #30703 SHOW STATUS LIKE 'Slave_running' is not compatible with `SHOW SLAVELuis Soares2009-09-291-1/+1
| | | | * | | | | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-292-1/+61
| | | | |/ / / / / /
| | | * | | | | | | backporting bug@27808 fixesAndrei Elkin2009-10-011-0/+2
| | | * | | | | | | WL#342 heartbeatAndrei Elkin2009-09-292-2/+2
| | | |/ / / / / /
| * | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-238-4/+29
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-212-0/+20
* | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-238-4/+29
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | new merge from next-mrBjorn Munch2009-10-226-2/+16
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-146-2/+16
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-136-2/+16
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Bug#47746 - main.innodb_mysql fails sporadically:John H. Embretsen2009-10-051-0/+2
| | | | * | | | | auto-mergeIngo Struewing2009-10-022-2/+4
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ mergingAlexey Botchkov2009-09-2914-56/+205
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ mergeMattias Jonsson2009-09-291-0/+4
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Bug#32430: 'show innodb status' causes errorsMattias Jonsson2009-09-251-0/+4
| | | | | * | | | | | | Bug#43733 Select on processlist let the embedded server crash (concurren...Alexey Botchkov2009-06-041-2/+0
View Lorry Controller Status