Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+0 |
|\ | |||||
| * | Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-... | Andrei Elkin | 2010-03-19 | 1 | -1/+0 |
| * | BUG#50780: 'show binary logs' debug assertion when binary | Luis Soares | 2010-02-05 | 1 | -1/+1 |
* | | Fix a bunch of Windows warnings | Bo Thorsen | 2010-04-21 | 1 | -0/+5 |
* | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -8/+14 |
|\ \ | |/ | |||||
| * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -5/+8 |
| * | BUG #28421 Infinite loop on slave relay logs | unknown | 2010-01-08 | 1 | -3/+6 |
* | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -10/+4 |
|\ \ | |/ | |||||
| * | Bug #42914 Log event that larger than max_allowed_packet results in stop of s... | unknown | 2009-09-18 | 1 | -10/+4 |
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -3/+7 |
|\ \ | |/ | |||||
| * | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -2/+2 |
| |\ | |||||
| | * | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -2/+2 |
| * | | Merge from 5.0 | Staale Smedseng | 2009-06-29 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 1 | -1/+1 |
| | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -4/+4 |
| | |\ | |||||
| | * \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -29/+46 |
| | |\ \ | |||||
| | * \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -9/+9 |
| | |\ \ \ | |||||
| | | * \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -9/+9 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -9/+9 |
| | | | |\ \ \ | |||||
| * | | | | | | | BUG#44270: RESET SLAVE does not reset Last_IO_Error or Last_IO_Errno | Luis Soares | 2009-06-03 | 1 | -0/+1 |
| * | | | | | | | Bug #44179 reset slave crashes in my_error when reset_logs returns non-zero | Andrei Elkin | 2009-04-30 | 1 | -0/+3 |
* | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -4/+4 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -21/+104 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -20/+103 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | BUG#41924: high-level replication functions are not commented | Sven Sandberg | 2009-01-09 | 1 | -20/+103 |
| * | | | | | | | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -51/+23 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | BUG#38734 rpl_server_id2 sync_with_master failed | He Zhenxing | 2008-09-28 | 1 | -1/+1 |
* | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -10/+10 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Small fixes; the missing DBUG_RETURN() fixes | unknown | 2008-02-22 | 1 | -1/+1 |
* | | | | | | | | Bug#28234 - global/session scope - documentation vs implementation | Ingo Struewing | 2008-11-22 | 1 | -51/+23 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Rename send_eof() to my_eof() for consistency with my_ok() and my_error() | unknown | 2008-02-19 | 1 | -4/+4 |
* | | | | | | | Rename send_ok to my_ok. Similarly to my_error, it only records the status, | unknown | 2008-02-19 | 1 | -6/+6 |
|/ / / / / / | |||||
* | | | | | | Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if | unknown | 2008-02-03 | 1 | -1/+1 |
* | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 | unknown | 2008-01-31 | 1 | -29/+46 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge | unknown | 2008-01-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fixes to make code compile on Windows. | unknown | 2008-01-31 | 1 | -1/+1 |
| * | | | | | | Post-merge changes. | unknown | 2008-01-30 | 1 | -1/+1 |
| * | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl | unknown | 2008-01-30 | 1 | -29/+46 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Replace one overlooked return with DBUG_RETURN in function log_loaded_block | unknown | 2008-01-06 | 1 | -1/+1 |
| | * | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl | unknown | 2007-12-21 | 1 | -25/+44 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | BUG#30435 loading large LOAD DATA INFILE breaks slave with | unknown | 2007-12-21 | 1 | -25/+44 |
| | | |/ / / / | |||||
| | * | | | | | Bug #31359 change_master sets group_master_log_pos twice, | unknown | 2007-12-21 | 1 | -3/+1 |
| | |/ / / / | |||||
* | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge | unknown | 2007-12-14 | 1 | -2/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-10-30 | 1 | -2/+8 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 | unknown | 2007-10-04 | 1 | -2/+8 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | BUG#30752 rpl_dual_pos_advance valgrind (jump depends on uninitialized LOG_INFO) | unknown | 2007-10-03 | 1 | -2/+8 |
| | | |/ / / | |||||
* | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge | unknown | 2007-10-29 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / |