summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* 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.mariadb-merge-mysql-5.1.39unknown2009-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->MariaDBmariadb-merge-mysql-5.1.38minusSergey 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
| * | Bug #45214 get_master_version_and_clock does not report error when queries failunknown2009-07-171-1/+0
| * | Bug #45214 get_master_version_and_clock does not report error when queries failunknown2009-07-161-32/+166
| * | BUG#44581 Slave stops when transaction with non-transactional table gets lock...Alfranio Correia2009-07-061-19/+0
| * | local merge: 5.1-bt bug branch --> 5.1-bt latestLuis Soares2009-06-261-0/+3
| |\ \
| | * | BUG#44270: RESET SLAVE does not reset Last_IO_Error or Last_IO_ErrnoLuis Soares2009-06-031-0/+3
| * | | Bug #38240 Crash in safe_mutex_lock () thr_mutex.c line 97 on rotate_relay_log Andrei Elkin2009-06-231-3/+20
| * | | BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in ValgrindAlfranio Correia2009-06-161-0/+4
| | | |
| | \ \
| *-. \ \ Merge from 5.0-bugteam for 43414Staale Smedseng2009-06-091-2/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-091-1/+1
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-091-1/+2
| | |/
| * | BUG#41725: upmerge: 5.0-bt --> 5.1-btLuis Soares2009-05-231-0/+9
| |\ \ | | |/
| | * BUG#41725: slave crashes when inserting into temporary table afterLuis Soares2009-05-231-0/+10
| | * Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-20/+20
| | |\
| | | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.clone-5.0.81-buildChad MILLER2009-04-141-7/+7
| | | |\
| | | * \ Merge chunk from trunk.Chad MILLER2008-07-101-30/+73
| | | |\ \
| | | * \ \ Merge chunk from trunk.Chad MILLER2008-07-101-7/+11
| | | |\ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-20/+20
| | | |\ \ \ \
| | | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-20/+20
| | | | |\ \ \ \
| | | | | * \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-20/+20
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-20/+20
| | | | | | |\ \ \ \
| * | | | | | \ \ \ \ auto-merge 5.1-bugteam (local) --> 5.1-bugteamAlfranio Correia2009-05-211-2/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | BUG#43949 Initialization of slave produces a warning message in ValgrindAlfranio Correia2009-04-191-2/+9
| * | | | | | | | | | | Merge main 5.1 into 5.1-buildJoerg Bruehe2009-05-081-24/+67
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove unused variable.Davi Arnaut2009-05-051-2/+0
| | * | | | | | | | | | | merging 5.0-bt to 5.1-btAndrei Elkin2009-04-301-20/+39
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | merging from 5.0-bt rep to a local branchAndrei Elkin2009-04-301-2/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ mergingAlexey Botchkov2009-04-281-2/+1
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Bug#25058 ignored return codes in memory allocation functionsAlexey Botchkov2008-11-211-2/+1
| | | * | | | | | | | | | | Bug #38694 Race condition in replication thread shutdown Andrei Elkin2009-04-281-26/+79
| | | |/ / / / / / / / / /
View Lorry Controller Status