Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 3 | -4/+6 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -4/+2 |
| |\ | |||||
| | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -4/+2 |
| | |\ | |||||
| | | * | Fix for bug #50667: The InnoDB plugin prevents initialization | Ramil Kalimullin | 2010-07-16 | 1 | -1/+2 |
| * | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Remove the file libmysqld.exp from the installer | Bo Thorsen | 2010-07-01 | 1 | -2/+0 |
| | * | | Hardcode the build path for the installer temporarily | Bo Thorsen | 2010-07-01 | 1 | -1/+2 |
| | * | | Fix cpack run | Bo Thorsen | 2010-07-01 | 1 | -1/+1 |
| | * | | Install the files for the embedded server | Bo Thorsen | 2010-06-28 | 1 | -0/+5 |
* | | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -1/+2 |
* | | | | 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 | 5 | -47/+69 |
|\ \ \ \ | |/ / / | |||||
| * | | | crash on --with-embedded-privilege-control builds: | Sergei Golubchik | 2010-05-14 | 1 | -0/+2 |
| * | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 2 | -2/+3 |
| * | | | more fixes for windows and status_user.test | Sergei Golubchik | 2010-04-02 | 1 | -1/+1 |
| * | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 4 | -43/+62 |
| |/ / | |||||
* | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 4 | -2/+18 |
|\ \ \ | |/ / | |||||
| * | | Fix windows build of embedded server (forgotten dependency). | unknown | 2010-01-31 | 1 | -1/+1 |
| * | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an... | Davi Arnaut | 2009-11-24 | 1 | -1/+0 |
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 5 | -1/+18 |
| |\ \ | | |/ | |||||
| | * | Automerge. | Davi Arnaut | 2009-11-02 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Bug#41728: Dropped symbol but no soname change | Davi Arnaut | 2009-09-29 | 1 | -0/+1 |
| | * | | Bug #47795 CMake, storage engine name different from directory name | Magnus BlÄudd | 2009-10-08 | 1 | -2/+11 |
| | * | | auto-merge | Ingo Struewing | 2009-10-02 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * \ | merging | Alexey Botchkov | 2009-09-29 | 5 | -69/+41 |
| | | |\ \ | |||||
| | | * | | | Bug#43733 Select on processlist let the embedded server crash (concurren... | Alexey Botchkov | 2009-06-04 | 1 | -0/+3 |
| | * | | | | auto-merge | Ingo Struewing | 2009-10-01 | 2 | -0/+2 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 2 | -0/+2 |
| | * | | | | merge | Georgi Kodinov | 2009-09-25 | 1 | -0/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | Bug #45159 : some tests in suite "jp" fail in embedded server (use LOAD DATA) | Georgi Kodinov | 2009-09-11 | 1 | -0/+1 |
* | | | | | Subquery optimization backport: | Sergey Petrunya | 2010-02-16 | 1 | -0/+1 |
* | | | | | Merge MWL#67: MRR Backport and BKA backport. | Sergey Petrunya | 2009-12-22 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Backport into MariaDB-5.2 the following: | Igor Babaev | 2009-12-20 | 2 | -1/+3 |
* | | | | | | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -2/+3 |
|/ / / / / | |||||
* | | | | | Add ds_mrr.cc to CMakeLists.txt | Sergey Petrunya | 2009-12-16 | 1 | -0/+1 |
* | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -1/+1 |
* | | | | Fix a problem in windows build introduced a few csets ago (in | Sergey Petrunya | 2009-10-05 | 1 | -0/+1 |
* | | | | Fix embedded build on Windows: contents of storage/xtradb think they are | Sergey Petrunya | 2009-10-03 | 1 | -2/+2 |
* | | | | Fix embedded server windows build: add opt_table_elimination.cc to list of files | Sergey Petrunya | 2009-10-01 | 1 | -0/+1 |
* | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge maria-5.1 -> maria-5.1-table-elimination | Sergey Petrunya | 2009-08-14 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -1/+1 |
* | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 4 | -79/+40 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -53/+6 |
| |\ \ \ \ | |||||
| | * | | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -53/+6 |
| | | |_|/ | | |/| | | |||||
| * | | | | 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 |