Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 4 | -3/+4 |
|\ | |||||
| * | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -1/+0 |
| |\ | |||||
| | * | Fix Windows embedded warnings | Vladislav Vaintroub | 2011-05-10 | 1 | -1/+0 |
| * | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Added calls to cleanup_mutexes() for embedded library. | Michael Widenius | 2011-04-28 | 1 | -0/+2 |
| * | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 2 | -2/+3 |
| |\ \ \ | |||||
| | * | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 2 | -2/+3 |
| * | | | | merge | Vladislav Vaintroub | 2011-03-28 | 1 | -6/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | CMake/code signing: | Vladislav Vaintroub | 2011-03-28 | 1 | -6/+1 |
| * | | | | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 2 | -15/+20 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -14/+0 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | workaround CMake bug 11240 (problems making mysqlserver.lib on Win64) | Vladislav Vaintroub | 2011-02-01 | 1 | -1/+7 |
| | * | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 2 | -14/+19 |
| * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -14/+0 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 2 | -14/+6 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | Fixed build failures | Michael Widenius | 2011-02-23 | 1 | -0/+6 |
| | | * | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -14/+0 |
| | | |\ | |||||
| * | | | | Workaround CMake bug http://www.vtk.org/Bug/view.php?id=11240 | Vladislav Vaintroub | 2011-02-12 | 1 | -0/+6 |
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| * | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 2 | -113/+21 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -3/+0 |
| | * | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 2 | -110/+21 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 2 | -110/+21 |
* | | | | | merge with xtradb-5.5.15 | Sergei Golubchik | 2011-07-18 | 1 | -1/+1 |
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -1/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 6 | -313/+53 |
|\ \ \ \ \ | |||||
| * | | | | | BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING. | Mayank Prasad | 2011-06-14 | 1 | -2/+2 |
| * | | | | | merge from 5.1 for bug#11764633 | Mayank Prasad | 2011-05-18 | 1 | -2/+26 |
| * | | | | | Merge | Kent Boortz | 2010-12-29 | 2 | -14/+15 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge | Kent Boortz | 2010-12-29 | 2 | -14/+15 |
| | |\ \ \ \ | |||||
| | | * | | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 2 | -14/+15 |
| | | * | | | | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 1 | -1/+1 |
| * | | | | | | Merge 5.5-bug58158 into 5.5-bugteam | Magnus Blåudd | 2010-11-24 | 1 | -2/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bug#58158 LINK_LIBRARIES for MYSQL_ADD_PLUGIN is not added to libmysqld | Magnus Blåudd | 2010-11-16 | 1 | -2/+1 |
| * | | | | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 2 | -282/+0 |
| * | | | | | | | BUG#57108: mysqld crashes when I attempt to install plugin | Mats Kindahl | 2010-11-04 | 1 | -1/+2 |
| |/ / / / / / | |||||
| * | | | | | | merge | Georgi Kodinov | 2010-10-04 | 2 | -14/+14 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge of mysql-5.5 into mysql-5.5-wl1054 | Georgi Kodinov | 2010-09-20 | 2 | -4/+7 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | merged mysql-5.5 into WL1054-5.5 | Georgi Kodinov | 2010-08-16 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 5 | -37/+56 |
* | | | | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 3 | -25/+2 |
* | | | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 6 | -44/+99 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | fix windows embedded | Sergei Golubchik | 2010-11-02 | 1 | -1/+2 |
| * | | | | | | | | 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 |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | |