summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-111-0/+20
|\
| * WL#2360 Performance schemaMarc Alff2010-01-061-0/+20
* | Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel":Guilhem Bichot2010-01-061-1/+2
|/
* don't show --ssl* option if ssl is not compiled inSergei Golubchik2009-12-251-1/+1
* slightly more complete mysqld--help testSergei Golubchik2009-12-241-5/+6
* WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-227-8/+58
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-191-1/+1
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-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-next-mr.Alexander Nozdrin2009-12-161-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-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
* | | | | | | mergeMattias Jonsson2009-12-152-0/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bug#49369: No testcase for key caches on partitionsMattias Jonsson2009-12-032-0/+15
| | |_|_|/ / | |/| | | |
* | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-036-0/+113
|\ \ \ \ \ \
| * \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-025-28/+145
| |\ \ \ \ \ \
| * | | | | | | No more socket and no more diffs in result files.Horst.Hunger2009-11-272-8/+8
| * | | | | | | Improvements to reduce the output for better reading and more stability. Horst.Hunger2009-11-263-10/+14
| * | | | | | | Reviewed patch of QA results for WL#798.Horst.Hunger2009-11-236-0/+109
| | |/ / / / / | |/| | | | |
* | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-025-28/+145
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Manual resolving for the following filesAndrei Elkin2009-12-015-28/+145
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-0/+4
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Backport for WL#4416Serge Kozlov2009-11-271-0/+41
| | * | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-133-7/+51
| | |\ \ \ \ \
| | | * | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-043-7/+51
| | * | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-0612-17/+40
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Auto merge from 5.1-rep+2-delivery1He Zhenxing2009-10-271-0/+7
| | |\ \ \ \ \ \
| | * | | | | | | Bug#13963 SHOW SLAVE HOSTS is unreliableunknown2009-10-201-21/+53
* | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-0/+22
|/ / / / / / / /
* | | | | | | | 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