summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* Patch that changes metadata locking subsystem to use mutex per lock andDmitry Lenev2010-01-211-23/+17
* Implementation of simple deadlock detection for metadata locks.Dmitry Lenev2009-12-301-13/+19
* A prerequisite patch for the fix for Bug#46224Konstantin Osipov2009-12-221-4/+613
* Backport of revno: 2617.68.18Jon Olav Hauglid2009-12-091-0/+8
* Backport of:Konstantin Osipov2009-12-081-0/+2
* Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,Konstantin Osipov2009-12-052-0/+3
* Backport of:Konstantin Osipov2009-12-032-4/+9
* Merge next-mr -> next-4284Konstantin Osipov2009-12-0311-28/+258
|\
| * Auto-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 bug46640merged_5_1_at_gca_bjorn.munch@sun.com-20091020100528-1iecjt9deam10gaaAndrei 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
| * | | | | | 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
| |/ / / / /
* | | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-7/+26
|/ / / / /
* | | | | 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
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |