Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
|\ | |||||
| * | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
| |\ | |||||
| | * | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| | | |\ | |||||
* | | | \ | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -1/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-11-30 | 1 | -1/+2 |
* | | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 1 | -1/+1 |
* | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+2 |
| | | | * | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -12/+3 |
| | | | |\ | |||||
| | | | * \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -1/+1 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-10-10 | 1 | -0/+1 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -0/+1 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -0/+1 |
| | | | | | |\ \ \ | |||||
| | | | | | | * | | | backport vista manifest patch | unknown | 2007-04-30 | 1 | -0/+5 |
| | | | | | | * | | | Use correct filename for profiling code. | unknown | 2007-02-22 | 1 | -1/+1 |
| | | | | | | * | | | Add profiling source file to cmake file. | unknown | 2007-02-22 | 1 | -0/+1 |
* | | | | | | | | | | merging. | Alexey Botchkov | 2011-11-12 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | merge | Sergei Golubchik | 2011-10-11 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | disable feedback plugin by default. Now on windows too. | Sergei Golubchik | 2011-10-06 | 1 | -1/+3 |
* | | | | | | | | | | | Precise GIS functions added. | Alexey Botchkov | 2011-05-04 | 1 | -0/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 1 | -35/+122 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Move common functionality (analyze service configuration) into winservice lib... | Vladislav Vaintroub | 2011-01-30 | 1 | -1/+4 |
| * | | | | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -35/+118 |
* | | | | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / | |||||
| | * | | | | | | | | Fixed build failures | Michael Widenius | 2011-02-23 | 1 | -1/+1 |
* | | | | | | | | | | Bug#53240 :Fixed dependency to prevent occasional situations | Vladislav Vaintroub | 2011-02-21 | 1 | -2/+1 |
* | | | | | | | | | | Merge DS-MRR/CPK improvements into 5.3-main | Sergey Petrunya | 2010-12-13 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge maria-5.3-mwl128 -> maria-5.2-mwl128-dsmrr-cpk | Sergey Petrunya | 2010-11-29 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | MWL#121-124 DS-MRR support for key-ordered retrieval, etc | Sergey Petrunya | 2010-11-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Better comments, move Lifo_buffer to separate file. | Sergey Petrunya | 2010-09-28 | 1 | -0/+1 |
* | | | | | | | | | | | | | Merge. | Igor Babaev | 2010-12-10 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Got the declarations related to the class JOIN_CACHE, its derivatives and | Igor Babaev | 2010-11-19 | 1 | -1/+2 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -5/+1 |
* | | | | | | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings | Vladislav Vaintroub | 2010-12-01 | 1 | -1/+1 |
* | | | | | | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | fixes for buildbot | Sergei Golubchik | 2010-07-25 | 1 | -0/+1 |