| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 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/+3 |
| | * | | | | Fix error in "make dist" (sql/CMakeLists.txt is not delivered in source distr... | Vladislav Vaintroub | 2011-04-03 | 1 | -1/+1 |
| * | | | | | forgotten h-files added to the NOINST_HEADERS | Alexey Botchkov | 2011-05-05 | 1 | -1/+2 |
| * | | | | | Precise GIS functions added. | Alexey Botchkov | 2011-05-04 | 1 | -0/+2 |
| * | | | | | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 1 | -1/+2 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | Move common functionality (analyze service configuration) into winservice lib... | Vladislav Vaintroub | 2011-01-30 | 1 | -0/+1 |
| | * | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -1/+1 |
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Bug#57210: remove pstack | Davi Arnaut | 2010-11-09 | 1 | -1/+0 |
| * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -1/+1 |
| * | | | | | Merge DS-MRR/CPK improvements into 5.3-main | Sergey Petrunya | 2010-12-13 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge maria-5.3-mwl128 -> maria-5.2-mwl128-dsmrr-cpk | Sergey Petrunya | 2010-11-29 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | MWL#121-124 DS-MRR support for key-ordered retrieval, etc | Sergey Petrunya | 2010-11-01 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Better comments, move Lifo_buffer to separate file. | Sergey Petrunya | 2010-09-28 | 1 | -0/+1 |
| * | | | | | | | | Merge. | Igor Babaev | 2010-12-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | | Got the declarations related to the class JOIN_CACHE, its derivatives and | Igor Babaev | 2010-11-19 | 1 | -0/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| | * | | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -1/+1 |
| * | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -3/+0 |
| |\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | |||||
| | * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -3/+0 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+0 |
| | | |\ \ \ | | | |/ / | |||||
| * | | | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -2/+3 |
| * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -7/+10 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -2/+3 |
| | * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -5/+7 |
| * | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -1/+3 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+2 |
| | |\ \ \ | | |/ / | |||||
| | | * | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+2 |
| * | | | | Subquery optimization backport: | Sergey Petrunya | 2010-02-16 | 1 | -1/+3 |
| * | | | | - Make testcase work for both debug and release | Sergey Petrunya | 2009-12-22 | 1 | -1/+1 |
| * | | | | Merge MWL#67: MRR Backport and BKA backport. | Sergey Petrunya | 2009-12-22 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | Backport into MariaDB-5.2 the following: | Igor Babaev | 2009-12-20 | 1 | -0/+1 |
| * | | | | | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -4/+7 |
| |/ / / / | |||||
| * | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+3 |
| |\ \ \ | |||||
| | * \ \ | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -1/+1 |
| | * | | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -1/+2 |
| | |/ / / | |||||
| * | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| | * | | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |