| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge | Sergei Golubchik | 2012-04-07 | 2 | -4/+14 |
| |\ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2012-04-04 | 2 | -11/+20 |
| | |\ | |||||
| | | * | Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CS... | Michael Widenius | 2012-04-04 | 2 | -11/+20 |
| * | | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -0/+2 |
| | |\ \ | | |/ | |||||
| | | * | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -0/+2 |
| * | | | 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 | 6 | -10/+22 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 6 | -10/+22 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -1/+0 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |
| * | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 4 | -9/+11 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -8/+9 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 6 | -10/+22 |
| * | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -3/+0 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| | * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -2/+0 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -2/+0 |
| | * | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 2 | -6/+5 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 2 | -6/+5 |
| * | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 3 | -70/+2 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Bug #11755431 (former 47205) | Jon Olav Hauglid | 2011-03-08 | 1 | -1/+2 |
| | * | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 2 | -69/+0 |
| * | | | | | merge. | Sergei Golubchik | 2010-11-25 | 3 | -5/+40 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -10/+6 |
| | |\ \ \ | | |/ / | |||||
| | | * | | build dynamic plugins with the -shared libtool option to avoid | Sergei Golubchik | 2010-09-09 | 1 | -1/+1 |
| | | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -10/+6 |
| | | |\ \ | | | |/ | |||||
| | * | | | 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 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -9/+2 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 4 | -38/+39 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | 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 | 3 | -6/+43 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 2 | -2/+14 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 2 | -2/+14 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-07-07 | 2 | -2/+14 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-07 | 2 | -2/+14 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock(). | unknown | 2007-07-04 | 2 | -2/+14 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |