Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | - Fix rpl_checksum test. Use basename of file in error messages, not the o | Vladislav Vaintroub | 2012-01-20 | 1 | -2/+3 |
* | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -12/+2 |
|\ | |||||
| * | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDS | Andrei Elkin | 2011-12-14 | 1 | -1/+0 |
| * | reverting the initial patch for bug#13437900 for refinement. | Andrei Elkin | 2011-11-29 | 1 | -0/+1 |
| * | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDS | Andrei Elkin | 2011-11-29 | 1 | -1/+0 |
| * | Merge from mysql-5.5.18-release | unknown | 2011-11-17 | 1 | -1/+9 |
| |\ | |||||
| | * | BUG#13337202 - REPLICATION PERFORMANCE DROP DUE TO "THE BINLOG MAY BE CORRUPT... | Alfranio Correia | 2011-11-02 | 1 | -1/+9 |
| * | | Bug#11763573 - 56299: MUTEX DEADLOCK WITH COM_BINLOG_DUMP, BINLOG PURGE, AND ... | Andrei Elkin | 2011-10-27 | 1 | -5/+2 |
| |/ | |||||
| * | Introduced this code to make the gcc 4.6.1 compiler happy. When | Alfranio Correia | 2011-10-14 | 1 | -0/+13 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+3 |
|\ \ | |||||
| * \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+5 |
| |\ \ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
| | |\ \ | |||||
* | | | | | After-merge fixes for 5.5 merge. | unknown | 2011-12-14 | 1 | -3/+17 |
* | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Automatic merge | Michael Widenius | 2011-09-26 | 1 | -4/+4 |
| |\ \ \ \ | |||||
| | * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+4 |
| * | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -3/+3 |
| |/ / / / | |||||
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -20/+25 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | bug#bug11747416 post-push fixes to correct file name print out. | Andrei Elkin | 2011-09-30 | 1 | -3/+8 |
| * | | | | Bug#11747416 : 32228 A disk full makes binary log corrupt | Andrei Elkin | 2011-09-29 | 1 | -16/+16 |
| * | | | | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ... | Alfranio Correia | 2011-07-18 | 1 | -2/+3 |
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -53/+227 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -0/+5 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fix buildbot failure in rpl_stop_slave.test. | unknown | 2011-05-09 | 1 | -0/+5 |
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -11/+40 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -2/+33 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -12/+179 |
| * | | | | | Fix two compiler warnings from Buildbot (including one bad merge). | unknown | 2011-01-11 | 1 | -1/+0 |
| * | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -30/+44 |
| |/ / / / | |||||
| * | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -0/+21 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -10/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -21/+104 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | 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 |
* | | | | | | | | | | | | | | | | fix memory leaks and other problems found by safemalloc | Sergei Golubchik | 2011-07-10 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -21/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | WL#5670: Proposal: Remove SHOW NEW MASTER statement | Sven Sandberg | 2011-02-16 | 1 | -17/+0 |
| * | | | | | | | | | | | | | | | merge mysql-5.1 --> mysql-5.5 | Alfranio Correia | 2011-01-31 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / |