Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -4/+4 |
|\ | |||||
| * | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -2/+2 |
| |\ | |||||
| | * | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -2/+2 |
| * | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -2/+2 |
* | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -39/+47 |
|\ \ \ | |/ / | |||||
| * | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -3/+3 |
| |\ \ | |||||
| | * \ | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+3 |
| | |\ \ | | | |/ | |||||
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -20/+57 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -20/+57 |
| | |\ \ | |||||
| * | \ \ | merge with 5.1 | Sergei Golubchik | 2010-07-25 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -2/+2 |
| * | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -9/+16 |
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -38/+38 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -38/+38 |
| | |\ \ \ | |||||
| * | \ \ \ | merged | Sergei Golubchik | 2010-03-15 | 1 | -3/+12 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -3/+12 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -54/+50 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -54/+50 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -24/+25 |
| |/ / / / / / | |||||
| * | | | | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -6/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -6/+6 |
| * | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -3/+3 |
| * | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -7/+40 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -67/+32 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -2/+2 |
* | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -5/+5 |
* | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2010-06-17 | 1 | -10/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | BUG#53560 CREATE TEMP./DROP TEMP. are not binglogged correctly after a failed... | Alfranio Correia | 2010-05-19 | 1 | -10/+0 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
* | | | | | | | | | | BUG 53893: Automerged from mysql-5.1-bugteam-gca into mysql-trunk-merge. | Luis Soares | 2010-06-04 | 1 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | BUG#53893: RBR: nullable unique key can lead to out-of-sync slave | Luis Soares | 2010-06-04 | 1 | -6/+3 |
* | | | | | | | | | | BUG 53893: automerged from mysql-5.1-bugteam into mysql-trunk-merge. | Luis Soares | 2010-06-03 | 1 | -2/+32 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | BUG#53893: RBR: nullable unique key can lead to out-of-sync slave | Luis Soares | 2010-06-02 | 1 | -2/+32 |
* | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-24 | 1 | -8/+28 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | BUG#52868: Wrong handling of NULL value during update, replication out | Luis Soares | 2010-04-21 | 1 | -8/+28 |
| |/ / / / / / / / | |||||
* | | | | | | | | | BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a | Alfranio Correia | 2010-04-20 | 1 | -10/+0 |
* | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+11 |
* | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -131/+70 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | A review comment for the fix for Bug#46672. | Konstantin Osipov | 2010-03-13 | 1 | -71/+20 |
| * | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-03-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-24 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -21/+29 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -14/+14 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -21/+32 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -17/+14 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |