Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+6 |
|\ | |||||
| * | fix windows embedded | Sergei Golubchik | 2010-11-02 | 1 | -1/+2 |
| * | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -0/+4 |
| |\ | |||||
| | * | 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 |
| * | | | 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 | -3/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+2 |
| | * | | more fixes for windows and status_user.test | Sergei Golubchik | 2010-04-02 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -2/+13 |
| |\ \ | | |/ | |||||
| | * | Fix windows build of embedded server (forgotten dependency). | unknown | 2010-01-31 | 1 | -1/+1 |
| | * | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+12 |
| | |\ | |||||
| * | | | Backport into MariaDB-5.2 the following: | Igor Babaev | 2009-12-20 | 1 | -1/+2 |
| * | | | Add ds_mrr.cc to CMakeLists.txt | Sergey Petrunya | 2009-12-16 | 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 MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -63/+6 |
| |\ \ | |||||
| * \ \ | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/... | unknown | 2009-06-09 | 1 | -2/+2 |
| * | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -5/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge mysql.com:/home/kent/bk/maria/mysql-maria-gca | unknown | 2008-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Windows fixes | unknown | 2008-01-10 | 1 | -0/+7 |
* | | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. | Jon Olav Hauglid | 2010-08-18 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge | Mattias Jonsson | 2010-08-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_admin | Mattias Jonsson | 2010-08-16 | 1 | -2/+2 |
| * | | | | | | | | merge | Mattias Jonsson | 2010-08-16 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait for | Mattias Jonsson | 2010-08-16 | 1 | -1/+2 |
| * | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). | Alexander Nozdrin | 2010-08-12 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Extract reload_acl_and_cache() and flush_tables_with_read_lock() | Konstantin Osipov | 2010-08-13 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -1/+1 |
* | | | | | | | Auto-merge from mysql-trunk-stage. | Alexander Nozdrin | 2010-06-21 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge | Daniel Fischer | 2010-06-18 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge | Daniel Fischer | 2010-04-21 | 1 | -1/+12 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Try a bunch of fixes. | Jonathan Perkin | 2010-03-31 | 1 | -1/+1 |
| | | * | | | | | | | Apply wlad fixes from mysql-next-mr-bugfixing | Jonathan Perkin | 2010-03-31 | 1 | -0/+5 |
| | * | | | | | | | | Add components to INSTALL, some eraly Wix support | Vladislav Vaintroub | 2010-02-10 | 1 | -2/+3 |
* | | | | | | | | | | Bug#42643: InnoDB does not support replication of TRUNCATE TABLE | Davi Arnaut | 2010-05-25 | 1 | -1/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Changes to build using CMake according to existing release packages: | Jonathan Perkin | 2010-05-12 | 1 | -1/+1 |
* | | | | | | | | | Backport of: | Konstantin Osipov | 2010-04-13 | 1 | -1/+1 |
* | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+1 |
* | | | | | | | | | Bug #52149 - packaging differences in CMake build | Vladislav Vaintroub | 2010-03-17 | 1 | -0/+5 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Install static client and embedded debug libraries | Vladislav Vaintroub | 2010-02-20 | 1 | -0/+5 |
* | | | | | | | | merge | Vladislav Vaintroub | 2010-02-16 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ |