Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 11 | -13/+110 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 11 | -13/+110 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 11 | -13/+110 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+26 |
| | | |\ | |||||
| | | | * | Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED | Mayank Prasad | 2011-05-18 | 1 | -2/+26 |
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 10 | -11/+84 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -5/+7 |
* | | | | | merging. | Alexey Botchkov | 2011-11-12 | 1 | -15/+12 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge | Sergei Golubchik | 2011-10-11 | 1 | -15/+12 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -15/+12 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | support for plugins on windows | Sergei Golubchik | 2011-10-04 | 1 | -15/+12 |
* | | | | | | gis-related tests fixes. | Alexey Botchkov | 2011-06-20 | 4 | -3/+5 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 |
* | | | | | | | Precise GIS functions added. | Alexey Botchkov | 2011-05-04 | 2 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | 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 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | 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 |
* | | | | | 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 |
* | | | | | 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 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | 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 |