summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-12-061-0/+9
|\
| * Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-0/+9
* | Merge with 5.1Michael Widenius2010-12-041-1/+1
|\ \ | |/
| * Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-1/+0
* | rename maria to ariaSergei Golubchik2010-09-121-5/+5
* | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+123
|\ \ | |/
| * Hardcode the build path for the installer temporarilyBo Thorsen2010-07-011-5/+0
| * Fix cpack runBo Thorsen2010-07-011-0/+5
| * Install MariaDB as a service with the installerBo Thorsen2010-06-301-0/+3
| * Install MTR and SQL-bench with CPack and NSISBo Thorsen2010-06-291-2/+44
| * Install the files for the embedded serverBo Thorsen2010-06-281-2/+5
| * Fix a loop and install more script files. Renames the perlscripts component t...Bo Thorsen2010-06-281-6/+6
| * Fix installing the localized error messages with cpackBo Thorsen2010-06-281-6/+6
| * Implement an NSIS based installerBo Thorsen2010-06-251-0/+75
* | Make MariaDB compile with VS 2010Hakan Kuecuekyilmaz2010-06-241-2/+1
* | mergedSergei Golubchik2010-06-161-1/+0
|\ \ | |/
| * Remove a warning on Windows. There is no CMakeLists.txt in the unittest examp...Bo Thorsen2010-06-141-1/+0
* | fixes for windows buildsSergei Golubchik2010-04-021-0/+1
* | Maria WL#61unknown2010-04-011-2/+2
* | mwl:98 - libservicesSergei Golubchik2010-03-031-0/+1
|/
* Merge with MySQL 5.1, with following additions:unknown2009-11-161-2/+13
|\
| * Bug #47795 CMake, storage engine name different from directory nameMagnus BlÄudd2009-10-081-2/+7
| * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+6
| * Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-141-0/+1
* | Fix embedded build on Windows: contents of storage/xtradb think they areSergey Petrunya2009-10-031-0/+4
* | MySQL 5.1 -> Maria 5.1 merge: Fix windows buildSergey Petrunya2009-09-161-2/+10
* | MySQL 5.1 -> MariaDB 5.1 merge: windows build fixesSergey Petrunya2009-09-151-0/+1
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-83/+112
|\ \ | |/
| * merge fix to define __NT__ on WindowsVladislav Vaintroub2009-08-111-3/+3
| |\
| | * Always compile with __NT__ on windows. in 5.1 itthis #define isVladislav Vaintroub2009-08-111-3/+3
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-71/+89
| |\ \ | | |/
| | * Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-72/+90
| * | Auto-mergeIgnacio Galarza2009-07-311-0/+10
| |\ \
| | * | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-0/+10
| * | | automergeGeorgi Kodinov2009-07-161-1/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Bug #45287: phase 1 : 32 bit compilation warningsGeorgi Kodinov2009-07-151-1/+1
| * | merged 5.0-bugteamGeorgi Kodinov2009-05-271-0/+4
| |\ \ | | |/
| | * Updates to build with community features enabled for community builds.MySQL Build Team2009-05-201-0/+4
* | | Merge of Percona XtraDB into MariaDB.unknown2009-06-111-1/+1
|\ \ \
| * | | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/...unknown2009-06-091-1/+1
* | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-1/+7
| |\ \ \ | | |/ /
| | * | merge fix for 43082 from 5.0-bugteamVladislav Vaintroub2009-02-251-1/+7
| | |\ \ | | | |/
| | | * Bug#43082: mysqld 32 bit cannot use big buffers due to 2GBVladislav Vaintroub2009-02-251-1/+7
| * | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-0/+5
| |\ \ \ | | |/ /
* | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-131-0/+1
* | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | merge: 5.1 -> 5.1-rplLuis Soares2009-01-231-0/+4
| |\ \
| | * | Bug#38784: Mysql server crash if table is altered with partition changes.Mattias Jonsson2008-11-121-0/+4
| * | | Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-061-8/+6
| |\ \ \ | | |/ /