summaryrefslogtreecommitdiff
path: root/mysql-test/extra
Commit message (Expand)AuthorAgeFilesLines
* Instead of writing "Errcode" to the log for Slave errors, use "Internal Maria...Michael Widenius2013-05-038-21/+21
* MDEV-26: Global transaction IDunknown2013-03-266-16/+19
* MDEV-4121: binlog.binlog_row_binlog sporadic test failureunknown2013-01-311-0/+3
* 5.5 mergeSergei Golubchik2013-01-291-0/+1922
|\
| * 5.3 mergeSergei Golubchik2013-01-151-0/+1922
| |\
| | * 5.2->5.3 mergeSergei Golubchik2013-01-101-0/+1922
| | |\
| | | * 5.1 mergeSergei Golubchik2013-01-101-0/+1922
| | | |\
| | | | * mysql-5.1.67 mergeSergei Golubchik2013-01-091-0/+1922
| | | | |\
| | | | | * BUG#14659685 - main.mysqlbinlog_row_myisam andShivji Kumar Jha2012-10-301-0/+1922
* | | | | | MDEV-532: Fix some race conditions in test cases.unknown2012-12-173-0/+5
* | | | | | Made max_relay_log_size depending on master connection.Michael Widenius2012-10-011-1/+2
* | | | | | Automatic mergeMichael Widenius2012-09-224-5/+50
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o...Michael Widenius2012-09-184-5/+50
* | | | | | MDEV-232: Remove one fsync() from commit phase.unknown2012-09-131-1/+1
* | | | | | MDEV-181: XID crash recovery across binlog boundariesunknown2012-06-223-11/+12
|/ / / / /
* | | | | 5.3 mergeSergei Golubchik2012-05-211-16/+25
|\ \ \ \ \ | |/ / / /
| * | | | mergeSergei Golubchik2012-04-051-0/+4
| |\ \ \ \ | | |/ / /
| | * | | mergeSergei Golubchik2012-04-051-0/+4
| | |\ \ \ | | | |/ /
| | | * | mysql-5.1.62 mergeSergei Golubchik2012-04-051-0/+4
| | | |\ \ | | | | |/
* | | | | cSergei Golubchik2012-05-211-0/+19
|\ \ \ \ \
| * | | | | BUG#12662190:COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM...Sujatha Sivakumar2012-04-121-0/+35
* | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-285-1/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-094-0/+13
| * | | | | Backout the patch for bug#11758263.Rohit Kalhans2012-02-084-13/+0
| * | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-084-0/+13
| * | | | | merge from 5.5 repo.Andrei Elkin2012-01-311-1/+1
| |\ \ \ \ \
| * | | | | | bug#3593869-64035Andrei Elkin2012-01-191-1/+2
* | | | | | | merge with mysql-5.5.21Sergei Golubchik2012-03-092-0/+37
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | BUG#13050593 - BACKSLASH SWALLOWED BY INCLUDE/SHOW_SLAVE_STATUS.INCNuno Carvalho2012-01-191-1/+1
| |/ / / / /
| * | | | | BUG#13593869 - 64035: SEVERAL ERRORS IN COM_BINLOG_DUMP/MYSQL_BINLOG_SEND CRA...Andrei Elkin2012-01-181-0/+33
| * | | | | Automerge from mysql-5.1 to mysql-5.5.Nuno Carvalho2012-01-161-0/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | BUG#11893288 60542: RPL.RPL_EXTRA_COL_MASTER_* DOESN'T TEST WHAT WAS INTENDEDNuno Carvalho2012-01-161-0/+4
* | | | | | per-combination result filesSergei Golubchik2012-02-061-3/+1
* | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Followup test fix after 13055685:Bjorn Munch2011-11-091-1/+0
* | | | | | rename debug variable to debug_dbug, to make test pass in release buildsSergei Golubchik2011-12-152-10/+10
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-222-9/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_eventsSergei Golubchik2011-09-231-6/+6
| * | | | | Merge with 5.2Michael Widenius2011-09-151-18/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fixed race condition that could cause diff to fail.Michael Widenius2011-09-151-18/+9
| | | |_|/ | | |/| |
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-034-75/+92
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-293-74/+65
| * | | | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ...Alfranio Correia2011-07-181-1/+27
* | | | | merge with 5.3Sergei Golubchik2011-10-1911-8/+240
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge with MariaDB 5.2Michael Widenius2011-05-1011-35/+154
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-0211-35/+154
| | |\ \ \ | | | | |/ | | | |/|
| | | * | One more test suppression for rpl_extra_col_master testsBjorn Munch2011-03-311-0/+1
| | | * | merge from 5.1 mainBjorn Munch2011-03-311-0/+20
| | | |\ \
| * | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-034-3/+13
| * | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-0144-552/+393
| |\ \ \ \ \ | | |/ / / /