| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -7/+20 | |
| * | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -4/+7 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -4/+7 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | merge 5.1 => 5.5 | Tor Didriksen | 2012-07-26 | 1 | -3/+7 | |
| | | |\ \ | | | |/ | ||||||
| | | | * | Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0 | Tor Didriksen | 2012-07-26 | 1 | -3/+7 | |
| * | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -0/+1 | |
| |\ \ \ | ||||||
| | * \ \ | merge from 5.2 | unknown | 2012-08-24 | 1 | -0/+1 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge from 5.1. | unknown | 2012-08-24 | 1 | -0/+1 | |
| | | |\ \ \ | ||||||
| | | | * | | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -0/+1 | |
| * | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+3 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+8 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+8 | |
| | | |\ \ \ \ | | | |/ / / | ||||||
| | | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 | |
| | | | |\ \ \ | | | | | |/ | | | | |/| | ||||||
| | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -0/+3 | |
| | | | | |\ \ | ||||||
| * | | | | | | | always use sql/sql_string.* files, never - client/sql_string.* | Sergei Golubchik | 2011-12-15 | 1 | -4/+0 | |
| * | | | | | | | fix new String:realloc* variants always to zero-terminate the string | Sergei Golubchik | 2011-12-14 | 1 | -2/+15 | |
| * | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+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 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 | |
| * | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -22/+56 | |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| | * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 | |
| | * | | | | | | | | Removed some alias warnings | Michael Widenius | 2011-05-18 | 1 | -2/+3 | |
| | * | | | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+12 | |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| | | * | | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+12 | |
| | | * | | | | | | | Fixed high-impact Windows 64bit warnings (at least 4000 of them) | Vladislav Vaintroub | 2011-02-19 | 1 | -1/+1 | |
| | | * | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -3/+7 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -0/+9 | |
| | * | | | | | | | | | fix noisy warnings in header files | Vladislav Vaintroub | 2011-05-04 | 1 | -1/+1 | |
| | * | | | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+13 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+13 | |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | ||||||
| | * | | | | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -18/+39 | |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -0/+9 | |
| | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | | * | | | | | | | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -18/+30 | |
| | * | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+7 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | ||||||
| | | * | | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -3/+7 | |
| | | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| * | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -5/+26 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| | * | | | | | | | Merge from 5.1 | Magne Mahre | 2011-02-17 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | | * | | | | | | Bug#48053 String::c_ptr has a race and/or does an invalid | Magne Mahre | 2011-02-17 | 1 | -0/+3 | |
| | | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | | Merge of fix for Bug#58165. | Martin Hansson | 2011-01-13 | 1 | -0/+10 | |
| | |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail and | Martin Hansson | 2011-01-13 | 1 | -0/+10 | |
| | | | |_|/ / | | |/| | | | ||||||
| | * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-10-19 | 1 | -3/+7 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -3/+7 | |
| | * | | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.c | Davi Arnaut | 2010-10-06 | 1 | -2/+6 | |
| | * | | | | | automerge 5.1-security --> 5.5-security (bug 55424) | Gleb Shchepa | 2010-08-15 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| * | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+0 | |
| * | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -1/+22 | |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |