Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge mysql-5.1 --> mysql-5.5 | Alfranio Correia | 2011-01-31 | 1 | -4/+4 |
|\ | |||||
| * | merge mysql-5.1 (local) --> mysql-5.1 | Alfranio Correia | 2011-01-31 | 1 | -4/+4 |
| |\ | |||||
| | * | BUG#59338 Inconsistency in binlog for statements that don't change any rows S... | Alfranio Correia | 2011-01-28 | 1 | -4/+4 |
* | | | Merge fix for bug 56817 from mysql-5.1 to mysql-5.5. | John H. Embretsen | 2011-01-29 | 2 | -0/+92 |
|\ \ \ | |/ / | |||||
| * | | Fix for Bug#56817 - mysqlhotcopy tests fail when DBI and DBD-mysql perl modul... | John H. Embretsen | 2011-01-29 | 2 | -0/+92 |
| |/ | |||||
| * | Merge two patches for bug 56895 into tip of mysql-5.1 branch. | John H. Embretsen | 2011-01-27 | 6 | -12/+51 |
| |\ | |||||
| | * | merge from 5.1 main | Bjorn Munch | 2011-01-19 | 4 | -0/+49 |
| | |\ | |||||
| * | | | Bug#56895 part 1 of 2: Backport of revid holyfoot@mysql.com-20100823084827-js... | John H. Embretsen | 2011-01-14 | 1 | -1/+1 |
* | | | | merge from 5.5 main | Bjorn Munch | 2011-01-19 | 4 | -0/+49 |
|\ \ \ \ | |||||
| * \ \ \ | Manual merge | Libing Song | 2011-01-19 | 4 | -0/+49 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#58546 test rpl_packet timeout failure sporadically on PB | Libing Song | 2011-01-19 | 4 | -0/+49 |
| | |/ / | |||||
* | | | | upmerge undo of 59063 | Bjorn Munch | 2011-01-18 | 2 | -12/+2 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Bug #59063 rpl_migration_crash_safe fails on Windows | Bjorn Munch | 2011-01-18 | 2 | -12/+2 |
| |/ | |||||
* | | Automerge from bug branch into latest mysql-5.5. | Luis Soares | 2011-01-14 | 1 | -0/+3 |
|\ \ | |||||
| * | | BUG#59444: rpl_row_show_relaylog_events fails on daily-5.5 test runs | Luis Soares | 2011-01-12 | 1 | -0/+3 |
* | | | merged BUG#59063 (backport from trunk) from 5.1 to 5.5 | Sven Sandberg | 2011-01-14 | 2 | -2/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | BUG#59063: rpl_migration_crash_safe fails on Windows | Sven Sandberg | 2011-01-14 | 2 | -2/+12 |
* | | | Bug#54820: master_connect_retry increased for Valgrind environment support | Serge Kozlov | 2011-01-14 | 1 | -1/+21 |
* | | | Bug #58841 Generalise handling of plugins in MTR mysql-test-run.pl script | Bjorn Munch | 2011-01-11 | 1 | -0/+41 |
| |/ |/| | |||||
* | | Some if simplifications in tests | Bjorn Munch | 2010-12-20 | 14 | -34/+31 |
|\ \ | |||||
| * \ | new merge from 5.5 | Bjorn Munch | 2010-12-20 | 6 | -3/+95 |
| |\ \ | |||||
| * | | | some more if stmt simplifications | Bjorn Munch | 2010-12-17 | 3 | -12/+12 |
| * | | | merge from 5.5 main | Bjorn Munch | 2010-12-17 | 8 | -3/+357 |
| |\ \ \ | |||||
* | \ \ \ | Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam. | Sven Sandberg | 2010-12-19 | 70 | -901/+3375 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | BUG#49978: Replication tests don't clean up replication state at the end | Sven Sandberg | 2010-12-19 | 70 | -842/+3288 |
* | | | | BUG#46166 | Luis Soares | 2010-12-07 | 2 | -2/+25 |
|\ \ \ \ | |/ / / | |||||
| * | | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error | Luis Soares | 2010-11-30 | 2 | -2/+25 |
| * | | | merge from 5.1-mtr | Bjorn Munch | 2010-11-27 | 1 | -6/+2 |
| |\ \ \ | |||||
* | \ \ \ | merge from 5.5-mtr | Bjorn Munch | 2010-11-27 | 1 | -6/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | upmerge 58515 | Bjorn Munch | 2010-11-26 | 1 | -6/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug #58515 Tests: use use exec echo, not write_file to write mysqld.1.expect | Bjorn Munch | 2010-11-26 | 1 | -6/+2 |
| | * | | | merge from 5.1 up to rev 3471 | Bjorn Munch | 2010-11-14 | 2 | -0/+6 |
| | |\ \ \ | |||||
* | | \ \ \ | Merging from mysql-5.1-bugteam | Alexander Barkov | 2010-11-26 | 1 | -0/+46 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8 | Alexander Barkov | 2010-11-26 | 1 | -0/+46 |
| * | | | | | merge from 5.1-mtr | Bjorn Munch | 2010-10-25 | 12 | -23/+23 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Follow-up to Bug #55582 which allows checking strings in if | Bjorn Munch | 2010-10-21 | 12 | -23/+23 |
| * | | | | | Bug#56423: Different count with SELECT and CREATE SELECT queries | Martin Hansson | 2010-10-07 | 1 | -0/+52 |
| * | | | | | merge from 5.1-mtr | Bjorn Munch | 2010-10-03 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
* | | | | | | Bug#57737 Character sets: search fails with like, contraction, index | Alexander Barkov | 2010-11-26 | 2 | -0/+23 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Bug#58190 BETWEEN no longer uses indexes for date or datetime fields | Alexander Barkov | 2010-11-19 | 1 | -0/+15 |
* | | | | | merge from 5.5-mtr | Bjorn Munch | 2010-11-19 | 19 | -30/+52 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Tests: many if/while expresissons simplified after 57276 | Bjorn Munch | 2010-11-17 | 19 | -30/+52 |
| * | | | | merge from 5.5 | Bjorn Munch | 2010-11-14 | 5 | -9/+155 |
| |\ \ \ \ | |||||
* | | | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 4 | -3/+314 |
* | | | | | | merge from 5.5-mtr | Bjorn Munch | 2010-10-26 | 12 | -22/+24 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Revert simplified if() in mysql-test/include/show_events.inc | Bjorn Munch | 2010-10-25 | 1 | -1/+3 |
| * | | | | | merge from 5.5 | Bjorn Munch | 2010-10-21 | 1 | -0/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | upmerge and adapt follow-up to 55582 | Bjorn Munch | 2010-10-21 | 12 | -23/+23 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Follow-up to Bug #55582 which allows chaecking strings in if | Bjorn Munch | 2010-10-20 | 12 | -23/+23 |
| | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | merge from 5.1 | Bjorn Munch | 2010-09-29 | 3 | -13/+44 |
| | |\ \ \ \ \ |