summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-53/+227
|\
| * Merge with 5.2Michael Widenius2011-05-161-0/+5
| |\
| | * Fix buildbot failure in rpl_stop_slave.test.unknown2011-05-091-0/+5
| * | Merge with MariaDB 5.2Michael Widenius2011-05-101-11/+40
| |\ \ | | |/
| | * Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-2/+33
| | |\
| * | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-12/+179
| * | | Fix two compiler warnings from Buildbot (including one bad merge).unknown2011-01-111-1/+0
| * | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-101-30/+44
| |/ /
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-2/+6
| |\ \
| * \ \ Merge with MySQL 5.1.49Michael Widenius2010-08-021-1/+1
| |\ \ \
| * \ \ \ Merge with MySQL 5.1.47Michael Widenius2010-05-261-0/+21
| |\ \ \ \
| * \ \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+0
| |\ \ \ \ \
| * | | | | | Fix a bunch of Windows warningsBo Thorsen2010-04-211-0/+5
| * | | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-8/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-10/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-3/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merged with mysql-5.1 tree.Michael Widenius2009-04-251-4/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-21/+104
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-10/+10
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Small fixes; the missing DBUG_RETURN() fixesunknown2008-02-221-1/+1
* | | | | | | | | | | | | | fix memory leaks and other problems found by safemallocSergei Golubchik2011-07-101-1/+0
* | | | | | | | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-21/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from 5.1.Guilhem Bichot2011-05-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | WL#5670: Proposal: Remove SHOW NEW MASTER statementSven Sandberg2011-02-161-17/+0
| * | | | | | | | | | | | | | merge mysql-5.1 --> mysql-5.5Alfranio Correia2011-01-311-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | BUG#55675 rpl.rpl_log_pos fails sporadically with error binlog truncated in t...Alfranio Correia2011-01-281-1/+8
| * | | | | | | | | | | | | | Manual Merge.unknown2011-01-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Postfix BUG#58546unknown2011-01-241-1/+1
| * | | | | | | | | | | | | | Manual mergeLibing Song2011-01-191-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Bug#58546 test rpl_packet timeout failure sporadically on PBLibing Song2011-01-191-0/+23
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | BUG#46166Luis Soares2010-12-071-1/+1
* | | | | | | | | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | BUG#55415 wait_for_update_bin_log enters a condition but does not leaveAlfranio Correia2010-09-061-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | BUG#55415 wait_for_update_bin_log enters a condition but does not leaveAlfranio Correia2010-08-041-2/+6
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | merged BUG#55322 from 5.1-bugteam to trunk-mergeSven Sandberg2010-07-261-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | merged BUG#55322 to 5.1-bugteamSven Sandberg2010-07-261-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKETSven Sandberg2010-07-201-0/+5
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-5/+2
* | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-2/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | BUG#53657: Slave crashed with error 22 when trying to lock mutexLuis Soares2010-05-241-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-091-0/+24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | BUG#43406 CHANGE MASTER TO should log previous state in error logAlfranio Correia2010-05-041-0/+24
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+4
* | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-234/+82
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-051-3/+6
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-3/+6
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ BUG#50364: manual merge to mysql-next-mr-bugfixing.Luis Soares2010-02-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status