Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | BUG#55675 rpl.rpl_log_pos fails sporadically with error binlog truncated in t... | Alfranio Correia | 2011-01-28 | 1 | -1/+8 |
| * | | | | | | | | | | | | | | Manual Merge. | unknown | 2011-01-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Postfix BUG#58546 | unknown | 2011-01-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Manual merge | Libing Song | 2011-01-19 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Bug#58546 test rpl_packet timeout failure sporadically on PB | Libing Song | 2011-01-19 | 1 | -0/+23 |
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | BUG#46166 | Luis Soares | 2010-12-07 | 1 | -1/+1 |
* | | | | | | | | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | BUG#55415 wait_for_update_bin_log enters a condition but does not leave | Alfranio Correia | 2010-09-06 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | BUG#55415 wait_for_update_bin_log enters a condition but does not leave | Alfranio Correia | 2010-08-04 | 1 | -2/+6 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | merged BUG#55322 from 5.1-bugteam to trunk-merge | Sven Sandberg | 2010-07-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | merged BUG#55322 to 5.1-bugteam | Sven Sandberg | 2010-07-26 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKET | Sven Sandberg | 2010-07-20 | 1 | -0/+5 |
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -5/+2 |
* | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -2/+1 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | BUG#53657: Slave crashed with error 22 when trying to lock mutex | Luis Soares | 2010-05-24 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-09 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | BUG#43406 CHANGE MASTER TO should log previous state in error log | Alfranio Correia | 2010-05-04 | 1 | -0/+24 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+4 |
* | | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -234/+82 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-05 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -3/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ | BUG#50364: manual merge to mysql-next-mr-bugfixing. | Luis Soares | 2010-02-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |