Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+13 |
|\ | |||||
| * | Bug #47795 CMake, storage engine name different from directory name | Magnus BlÄudd | 2009-10-08 | 1 | -2/+7 |
| * | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+6 |
| * | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith. | Jonathan Perkin | 2009-08-14 | 1 | -0/+1 |
* | | Fix embedded build on Windows: contents of storage/xtradb think they are | Sergey Petrunya | 2009-10-03 | 1 | -0/+4 |
* | | MySQL 5.1 -> Maria 5.1 merge: Fix windows build | Sergey Petrunya | 2009-09-16 | 1 | -2/+10 |
* | | MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes | Sergey Petrunya | 2009-09-15 | 1 | -0/+1 |
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -83/+112 |
|\ \ | |/ | |||||
| * | merge fix to define __NT__ on Windows | Vladislav Vaintroub | 2009-08-11 | 1 | -3/+3 |
| |\ | |||||
| | * | Always compile with __NT__ on windows. in 5.1 itthis #define is | Vladislav Vaintroub | 2009-08-11 | 1 | -3/+3 |
| * | | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -71/+89 |
| |\ \ | | |/ | |||||
| | * | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -72/+90 |
| * | | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -0/+10 |
| |\ \ | |||||
| | * | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 1 | -0/+10 |
| * | | | automerge | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Bug #45287: phase 1 : 32 bit compilation warnings | Georgi Kodinov | 2009-07-15 | 1 | -1/+1 |
| * | | merged 5.0-bugteam | Georgi Kodinov | 2009-05-27 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | Updates to build with community features enabled for community builds. | MySQL Build Team | 2009-05-20 | 1 | -0/+4 |
* | | | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/... | unknown | 2009-06-09 | 1 | -1/+1 |
* | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -1/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -1/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | merge fix for 43082 from 5.0-bugteam | Vladislav Vaintroub | 2009-02-25 | 1 | -1/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#43082: mysqld 32 bit cannot use big buffers due to 2GB | Vladislav Vaintroub | 2009-02-25 | 1 | -1/+7 |
| * | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -0/+5 |
| |\ \ \ | | |/ / | |||||
* | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -0/+1 |
* | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -0/+4 |
| |\ \ | |||||
| | * | | Bug#38784: Mysql server crash if table is altered with partition changes. | Mattias Jonsson | 2008-11-12 | 1 | -0/+4 |
| * | | | Merging 5.1 main into 5.1-rpl. | Mats Kindahl | 2008-10-06 | 1 | -8/+6 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl | unknown | 2008-04-03 | 1 | -0/+12 |
| |\ \ \ | |||||
| * | | | | Windows fixeds for mtr | unknown | 2007-12-19 | 1 | -0/+1 |
* | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -8/+6 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge | Vladislav Vaintroub | 2008-09-01 | 1 | -8/+6 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | Work around for older version of cmake. | unknown | 2008-04-07 | 1 | -4/+4 |
| | * | | Changes for Visual Studio 9 | unknown | 2008-04-07 | 1 | -8/+6 |
| | * | | Merge mysql.com:/misc/mysql/mysql-5.0 | unknown | 2008-03-27 | 1 | -0/+4 |
| | |\ \ | |||||
* | | \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -0/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge mysql.com:/misc/mysql/mysql-5.1 | unknown | 2008-03-27 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt | unknown | 2008-03-21 | 1 | -0/+4 |
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| | | |||||
| | | * | | Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) | unknown | 2008-03-21 | 1 | -0/+4 |
| * | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugs | unknown | 2008-02-27 | 1 | -0/+8 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | Bug #23839 Multiple declarations of macros | unknown | 2008-02-27 | 1 | -0/+8 |
| | |/ | |||||
* | | | Fix windows warnings using correct datatypes if possible | unknown | 2008-01-11 | 1 | -0/+3 |
* | | | Windows fixes | unknown | 2008-01-10 | 1 | -0/+11 |
|/ / | |||||
* | | Merge alf.(none):/src/bug31319/my50-bug31319 | unknown | 2007-11-02 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Bug#31319 CMake build does not check for minimum required version | unknown | 2007-11-02 | 1 | -0/+2 |
* | | Merge alf.(none):/src/bug31289/my50-bug31289 | unknown | 2007-10-08 | 1 | -8/+9 |
|\ \ | |/ | |||||
| * | Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest | unknown | 2007-10-08 | 1 | -8/+9 |
* | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js: | unknown | 2007-08-06 | 1 | -25/+9 |