Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 1 | -35/+122 |
|\ | |||||
| * | 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 | -1/+4 |
| * | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -35/+118 |
* | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Fixed build failures | Michael Widenius | 2011-02-23 | 1 | -1/+1 |
* | | | Bug#53240 :Fixed dependency to prevent occasional situations | Vladislav Vaintroub | 2011-02-21 | 1 | -2/+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 | -1/+2 |
| |\ \ \ | |||||
| * \ \ \ | 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 | -1/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Got the declarations related to the class JOIN_CACHE, its derivatives and | Igor Babaev | 2010-11-19 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -5/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -5/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -5/+1 |
* | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings | Vladislav Vaintroub | 2010-12-01 | 1 | -1/+1 |
* | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -1/+6 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | fixes for buildbot | Sergei Golubchik | 2010-07-25 | 1 | -0/+1 |
| * | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+5 |
| |\ \ | | |/ | |||||
| | * | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+5 |
| * | | Make MariaDB compile with VS 2010 | Hakan Kuecuekyilmaz | 2010-06-24 | 1 | -1/+0 |
* | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -0/+1 |
* | | | Add sql/opt_index_cond_pushdown.cc to CMakeLists.txt files | Sergey Petrunya | 2010-06-27 | 1 | -0/+1 |
* | | | Fix windows build: add sql/opt_subselect.cc to CMakeLists.txt files | Sergey Petrunya | 2010-06-27 | 1 | -0/+1 |
* | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -4/+5 |
|\ \ \ | |/ / | |||||
| * | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Bug #48042 The description for Event ID ( 100 ) in Source ( MySQL ) cannot be... | Vladislav Vaintroub | 2010-04-26 | 1 | -2/+2 |
| * | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -0/+1 |
| * | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+1 |
* | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 1 | -1/+1 |
| |/ / | |||||
| * | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -1/+1 |
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+1 |
* | | | Backport into MariaDB-5.2 the following: | Igor Babaev | 2009-12-20 | 1 | -3/+4 |
* | | | Add ds_mrr.cc to CMakeLists.txt | Sergey Petrunya | 2009-12-16 | 1 | -0/+1 |
|/ / | |||||
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -3/+3 |
|\ \ | |||||
| * \ | Merge | Sergey Petrunya | 2009-09-02 | 1 | -2/+3 |
| |\ \ | |||||
| | * | | Trivial fixes for windows compile failures | Sergey Petrunya | 2009-09-01 | 1 | -2/+3 |
| * | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -12/+2 |
| |\ \ | |||||
| * \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -3/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * | | | | | Windows fixes | unknown | 2008-01-10 | 1 | -0/+3 |
* | | | | | | MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes | Sergey Petrunya | 2009-09-15 | 1 | -1/+2 |
| |_|_|_|/ |/| | | | |