| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge with 5.1 | Michael Widenius | 2012-04-04 | 1 | -10/+18 | |
| | |\ | ||||||
| | | * | Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CS... | Michael Widenius | 2012-04-04 | 1 | -10/+18 | |
| * | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+1 | |
| |\ \ \ | ||||||
| | * \ \ | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 | |
| | |\ \ \ | ||||||
| * | \ \ \ | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 | |
| |\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 | |
| | | |\ \ \ | | | | |/ | | | |/| | ||||||
| * | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+4 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 | |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 | |
| * | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -4/+35 | |
| |\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||||
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -8/+4 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -8/+4 | |
| | | |\ \ | | | |/ | ||||||
| | * | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+7 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Fixed trival bug introduced in last patch (buffer was not extended) | Michael Widenius | 2010-06-23 | 1 | -1/+5 | |
| | | * | | Fixes for Opensolaris (to get buildbot green) | Michael Widenius | 2010-06-23 | 1 | -0/+3 | |
| | * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+14 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -2/+14 | |
| | | |\ \ | ||||||
| | * | | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -1/+17 | |
| | |/ / / | ||||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+2 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -16/+17 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+11 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -19/+19 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Added versioning of row data | unknown | 2008-04-10 | 1 | -1/+1 | |
| | * | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -6/+41 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -2/+10 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -2/+10 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-07-07 | 1 | -2/+10 | |
| | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-07 | 1 | -2/+10 | |
| | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock(). | unknown | 2007-07-04 | 1 | -2/+10 | |
| * | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-07-29 | 1 | -8/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 1 | -8/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -8/+4 | |
| | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -3/+3 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -4/+4 | |
| * | | | | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-04-01 | 1 | -0/+1 | |
| * | | | | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+3 | |
| * | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -2/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -2/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Bug#33717 INSERT...(default) fails for enum. Crashes CSV tables, loads spaces... | Sergey Glukhov | 2010-02-17 | 1 | -2/+14 | |
| | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj. | Sergey Vojtovich | 2009-12-09 | 1 | -8/+65 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Bug#40814 CSV engine does not parse \X characters when they occur in unquoted... | V Narayanan | 2009-12-03 | 1 | -8/+65 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -82/+142 | |
| * | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -3/+3 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -2/+2 | |
| | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -7/+7 | |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |