summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-5/+6
|\
| * Merge with MySQL 5.1.55Michael Widenius2011-02-201-5/+6
| |\
| | * BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error Luis Soares2010-11-301-5/+6
| | * Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+1
* | | merge with 5.1Michael Widenius2010-11-301-7/+71
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.53Michael Widenius2010-11-251-7/+71
| |\ \ | | |/
| | * Bug#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends,unknown2010-10-161-1/+10
| | * BUG 55263: automerged bzr bundle from bug report into Luis Soares2010-10-131-5/+59
| | |\
| | | * BUG#55263: assert in check_binlog_magicLuis Soares2010-09-241-5/+59
| | * | Bug#55375 Transaction bigger than max_binlog_cache_size crashes slaveunknown2010-10-091-1/+2
| | |/
* | | merge with 5.1Sergei Golubchik2010-09-111-3/+3
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+3
| |\ \ | | |/
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-5/+2
| | * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-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
|\ \ | |/
| * BUG#53657: Slave crashed with error 22 when trying to lock mutexLuis Soares2010-05-241-2/+2
* | Fixed compiler warningsMichael Widenius2010-05-271-1/+2
* | Merge with MySQL 5.1.47Michael Widenius2010-05-261-0/+28
|\ \ | |/
| * BUG#43407 SET GLOBAL SQL_SLAVE_SKIP_COUNTER should log previous state in erro...Alfranio Correia2010-05-041-0/+31
* | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+30
|\ \ | |/
| * Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-...Andrei Elkin2010-03-191-3/+30
| * Bug #51089 SHOW STATUS LIKE 'Slave_running' is not compatible with `SHOW SL...Andrei Elkin2010-02-251-0/+1
* | Removed compiler warningsMichael Widenius2010-04-071-0/+1
* | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-4/+2
|\ \ | |/
| * merging 5.0-bt -> 5.1-bt to local branch with bug@47210Andrei Elkin2009-12-141-4/+2
| |\
| | * Bug #47210 first execution of "start slave until" stops too early Andrei Elkin2009-11-121-6/+8
* | | 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
|\ \ \ | |/ /
| * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-1/+2
| * | Bug#46640: output from mysqlbinlog command in 5.1 breaks replicationunknown2009-10-141-31/+26
| * | Manual merge.Davi Arnaut2009-09-301-1/+1
| |\ \ | | |/
| | * Bug#47525: MySQL crashed (Federated)Davi Arnaut2009-09-301-1/+1
| * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-7/+7
| * | A patch for Bug#47474 (mysqld hits Dbug_violation_helper assertAlexander Nozdrin2009-09-231-3/+6
| * | Bug #42914 Log event that larger than max_allowed_packet results in stop of s...unknown2009-09-181-4/+8
* | | 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
| |\ \ \ | | |/ /
| | * | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-08-241-3/+0
| | |\ \
| | | * | BUG#45694 Deadlock in replicated statement is not retriedAlfranio Correia2009-08-191-3/+0
| | * | | Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-131-0/+25
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Bug#46013: rpl_extraColmaster_myisam fails on pb2Davi Arnaut2009-08-131-0/+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 from 5.0Gleb Shchepa2009-07-241-13/+8
| |\ \ | | |/
| | * Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-14/+6
| | * Merge from 5.0-btStaale Smedseng2009-06-291-3/+3
View Lorry Controller Status