summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-12/+24
|\
| * merge with 5.1Sergei Golubchik2010-09-111-3/+3
| |\
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+3
| | |\
| * | | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-2/+2
| |/ /
| * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+2
| |\ \
| * | | Fixed compiler warningsMichael Widenius2010-05-271-1/+2
| * | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-0/+28
| |\ \ \
| * \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+30
| |\ \ \ \
| * | | | | Removed compiler warningsMichael Widenius2010-04-071-0/+1
| * | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-4/+2
| |\ \ \ \ \
| * \ \ \ \ \ Changed version number from RC to stableMichael Widenius2010-01-291-2/+3
| |\ \ \ \ \ \
| * | | | | | | Fixed bug #49474 Replication from 4.0 to 5.1 brokenMichael Widenius2009-12-061-5/+14
| * | | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-40/+43
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-3/+25
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-3/+25
| | |\ \ \ \ \ \ \
| * | | | | | | | | Fixed compiler warning messageMichael Widenius2009-10-261-5/+5
| |/ / / / / / / /
| * | | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+1
| * | | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-93/+285
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge of Percona XtraDB into MariaDB.unknown2009-06-111-51/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-111-51/+0
| * | | | | | | | | | Fixed problems in mergeMichael Widenius2009-05-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
| * | | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-0/+43
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-3/+36
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-2/+3
* | | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 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 trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-271-12/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+0
| * | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-11/+0
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-1/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-4/+4
* | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-091-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-3/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | BUG#53657: Slave crashed with error 22 when trying to lock mutexLuis Soares2010-05-241-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | A pre-requisite for WL#5419 "LOCK_open scalability: Konstantin Osipov2010-06-101-1/+0
* | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-091-0/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | BUG#43407 SET GLOBAL SQL_SLAVE_SKIP_COUNTER should log previous state in erro...Alfranio Correia2010-05-041-0/+31
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-4/+13
* | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-425/+315
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-241-0/+2
| * | | | | | | | | BUG#50364: Automerge from mysql-trunk-bugfixing.Luis Soares2010-02-221-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-9/+9
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ BUG#50364: manual merge to mysql-next-mr-bugfixing.Luis Soares2010-02-031-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Patch to eliminate warnings in mysql-next-mr-bugteam.Mats Kindahl2010-01-251-6/+6
| * | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-4/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
View Lorry Controller Status