Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge mysql-5.5-innodb -> mysql-5.5 | Vasil Dimov | 2011-04-21 | 1 | -5/+7 |
|\ | |||||
| * | Merge mysql-5.1-innodb to mysql-5.5-innodb. | Marko Mäkelä | 2011-04-11 | 1 | -5/+7 |
| |\ | |||||
| | * | Bug #11766513 - 59641: Prepared XA transaction in system after hard crash | Marko Mäkelä | 2011-04-07 | 1 | -5/+7 |
* | | | Merging patch for bug#11765157 from mysql-5.1. | Nirbhay Choubey | 2011-04-08 | 2 | -3/+9 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bug#11765157 - 58090: mysqlslap drops schema specified in | Nirbhay Choubey | 2011-04-08 | 2 | -3/+9 |
| |/ | |||||
* | | Merged BUG#11766427, BUG#59539 from 5.1 to 5.5. | Sven Sandberg | 2011-03-25 | 1 | -3/+11 |
|\ \ | |/ | |||||
| * | BUG#11766427, BUG#59539: Filter by server id in mysqlbinlog fails | Sven Sandberg | 2011-03-25 | 1 | -3/+11 |
* | | merge from 5.5 main | Bjorn Munch | 2011-03-22 | 3 | -6/+7 |
|\ \ | |||||
| * \ | Merge from mysql-5.5.10-release | unknown | 2011-03-16 | 3 | -6/+7 |
| |\ \ | |||||
| | * | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 3 | -6/+7 |
* | | | | upmerge 11885854 | Bjorn Munch | 2011-03-18 | 1 | -3/+5 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Bug #11885854 MYSQLTEST: PS-PROTOCOL IMPLIED BY CURSOR-PROTOCOL LOST AFTER EN... | Bjorn Munch | 2011-03-18 | 1 | -3/+5 |
* | | | Bug #11755431 (former 47205) | Jon Olav Hauglid | 2011-03-08 | 1 | -6/+48 |
* | | | Remove last traces of HAVE_NDBCLUSTER_DB define - it has not had an effect in... | Magnus Blåudd | 2011-02-21 | 1 | -3/+0 |
* | | | Merge of fix for bug#11766310 from mysql-5.1 -> mysql-5.5. | Nirbhay Choubey | 2011-02-21 | 1 | -2/+8 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Bug#11766310 : 59398: MYSQLDUMP 5.1 CAN'T HANDLE A DASH | Nirbhay Choubey | 2011-02-21 | 1 | -2/+8 |
* | | Automerge from mysql-5.1 for follow-up bug#57450. | Dmitry Shulga | 2011-02-09 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Follow up fix for bug#57450. | Dmitry Shulga | 2011-02-09 | 1 | -0/+2 |
* | | Automerge from mysql-5.1 for follow-up bug#57450. | Dmitry Shulga | 2011-02-09 | 2 | -0/+10 |
|\ \ | |/ | |||||
| * | Follow up fix for bug#57450. | Dmitry Shulga | 2011-02-09 | 2 | -0/+10 |
* | | Auto-merge from mysql-5.1 for bug#57450. | Dmitry Shulga | 2011-02-05 | 3 | -20/+33 |
|\ \ | |/ | |||||
| * | Fixed bug#57450 - mysql client enter in an infinite loop | Dmitry Shulga | 2011-02-05 | 3 | -20/+33 |
* | | merge of bug 47902 and (null-merge) of bug 57924. | Mattias Jonsson | 2011-01-26 | 1 | -2/+6 |
|\ \ | |/ | |||||
| * | merge | Mattias Jonsson | 2011-01-26 | 1 | -2/+6 |
| |\ | |||||
| | * | Bug#47902: partition_recover_myisam fails with --ps-protocol | Mattias Jonsson | 2011-01-10 | 1 | -2/+6 |
* | | | Fixed copyright headers in mtr src files | Bjorn Munch | 2011-01-18 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Fixed copyright headers in mtr src files | Bjorn Munch | 2011-01-18 | 1 | -2/+2 |
* | | | Bug#58139 : default-auth option not recognized in MySQL standard | Nirbhay Choubey | 2011-01-16 | 10 | -6/+91 |
* | | | Merge of fix for bug#58221 from mysql-5.1 -> mysql-5.5. | Nirbhay Choubey | 2011-01-16 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Bug#58221 : mysqladmin --sleep=x --count=x keeps looping | Nirbhay Choubey | 2011-01-16 | 1 | -0/+3 |
* | | | Merging fix of Bug#13618 from mysql-5.1. | Nirbhay Choubey | 2011-01-14 | 1 | -2/+11 |
|\ \ \ | |/ / | |||||
| * | | Bug#13618 : mysqldump --xml omits comment on table field | Nirbhay Choubey | 2011-01-14 | 1 | -2/+11 |
* | | | Merging from mysql-5.1. | Nirbhay Choubey | 2011-01-13 | 1 | -5/+15 |
|\ \ \ | |/ / | |||||
| * | | Bug#59109 : mysqlslap crashes on mysql_fetch_row after ignoring | Nirbhay Choubey | 2011-01-13 | 1 | -5/+15 |
* | | | merge from 5.5 main | Bjorn Munch | 2011-01-12 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -3/+1 |
* | | | | Bug #59153 mysqltest produces a valgrind warning when the running test fails | Bjorn Munch | 2011-01-11 | 1 | -0/+7 |
* | | | | upmerge 58896,58900,59002 | Bjorn Munch | 2011-01-11 | 1 | -13/+27 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Bug #58900 query_get_value crashes when result begins with dollar sign | Bjorn Munch | 2011-01-11 | 1 | -4/+9 |
| * | | Bug #59002 Please make mtr print correct file and line number when tests fail | Bjorn Munch | 2011-01-11 | 1 | -9/+18 |
| |/ | |||||
* | | Merge | Kent Boortz | 2010-12-29 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge | Kent Boortz | 2010-12-29 | 1 | -2/+2 |
| |\ | |||||
| | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -2/+2 |
* | | | Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam. | Sven Sandberg | 2010-12-19 | 1 | -14/+64 |
|\ \ \ | |/ / | |||||
| * | | BUG#49978: Replication tests don't clean up replication state at the end | Sven Sandberg | 2010-12-19 | 1 | -14/+64 |
| * | | merge | Georgi Kodinov | 2010-12-16 | 1 | -3/+5 |
| |\ \ | |||||
| | * \ | Manual-merge from mysql-5.1-bugteam. | Ramil Kalimullin | 2010-11-22 | 1 | -5/+8 |
| | |\ \ | |||||
| | * | | | post-push fix, backported --replace_result patch | Mattias Jonsson | 2010-11-17 | 1 | -3/+5 |
| * | | | | merge from 5.1-mtr | Bjorn Munch | 2010-12-09 | 1 | -16/+43 |
| |\ \ \ \ | |||||
* | \ \ \ \ | merge from 5.5-mtr | Bjorn Munch | 2010-12-09 | 1 | -9/+25 |
|\ \ \ \ \ \ |