summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+0
|\
| * Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-...Andrei Elkin2010-03-191-1/+0
| * BUG#50780: 'show binary logs' debug assertion when binary Luis Soares2010-02-051-1/+1
* | Fix a bunch of Windows warningsBo Thorsen2010-04-211-0/+5
* | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-8/+14
|\ \ | |/
| * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-5/+8
| * BUG #28421 Infinite loop on slave relay logsunknown2010-01-081-3/+6
* | Merge with MySQL 5.1, with following additions:unknown2009-11-161-10/+4
|\ \ | |/
| * Bug #42914 Log event that larger than max_allowed_packet results in stop of s...unknown2009-09-181-10/+4
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-3/+7
|\ \ | |/
| * Merge from 5.0Gleb Shchepa2009-07-241-2/+2
| |\
| | * Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-2/+2
| * | Merge from 5.0Staale Smedseng2009-06-291-1/+1
| |\ \ | | |/
| | * Merge from 5.0-btStaale Smedseng2009-06-291-1/+1
| | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-4/+4
| | |\
| | * \ Merge chunk from trunk.Chad MILLER2008-07-101-29/+46
| | |\ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-9/+9
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-9/+9
| | | |\ \ \
| | | | * \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-9/+9
| | | | |\ \ \
| * | | | | | | BUG#44270: RESET SLAVE does not reset Last_IO_Error or Last_IO_ErrnoLuis Soares2009-06-031-0/+1
| * | | | | | | Bug #44179 reset slave crashes in my_error when reset_logs returns non-zeroAndrei Elkin2009-04-301-0/+3
* | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-4/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-4/+4
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-21/+104
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-231-20/+103
| |\ \ \ \ \ \
| | * | | | | | BUG#41924: high-level replication functions are not commentedSven Sandberg2009-01-091-20/+103
| * | | | | | | merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-51/+23
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | BUG#38734 rpl_server_id2 sync_with_master failedHe Zhenxing2008-09-281-1/+1
* | | | | | | | 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
* | | | | | | | Bug#28234 - global/session scope - documentation vs implementationIngo Struewing2008-11-221-51/+23
| |/ / / / / / |/| | | | | |
* | | | | | | Rename send_eof() to my_eof() for consistency with my_ok() and my_error()unknown2008-02-191-4/+4
* | | | | | | Rename send_ok to my_ok. Similarly to my_error, it only records the status,unknown2008-02-191-6/+6
|/ / / / / /
* | | | | | Bug #34244 Test ndb_binlog_log_bin fails for 'drop table ifunknown2008-02-031-1/+1
* | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-01-311-29/+46
|\ \ \ \ \ \
| * \ \ \ \ \ Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-mergeunknown2008-01-311-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixes to make code compile on Windows.unknown2008-01-311-1/+1
| * | | | | | Post-merge changes.unknown2008-01-301-1/+1
| * | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2008-01-301-29/+46
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Replace one overlooked return with DBUG_RETURN in function log_loaded_blockunknown2008-01-061-1/+1
| | * | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rplunknown2007-12-211-25/+44
| | |\ \ \ \ \
| | | * | | | | BUG#30435 loading large LOAD DATA INFILE breaks slave with unknown2007-12-211-25/+44
| | | |/ / / /
| | * | | | | Bug #31359 change_master sets group_master_log_pos twice, unknown2007-12-211-3/+1
| | |/ / / /
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-141-2/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-10-301-2/+8
| |\ \ \ \ \
| | * \ \ \ \ Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0unknown2007-10-041-2/+8
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | BUG#30752 rpl_dual_pos_advance valgrind (jump depends on uninitialized LOG_INFO)unknown2007-10-031-2/+8
| | | |/ / /
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmergeunknown2007-10-291-0/+3
|\ \ \ \ \ \ | |/ / / / /