Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -1/+0 |
|\ | |||||
| * | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 1 | -1/+0 |
* | | 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-07-03 | 1 | -2/+2 |
| | | |\ | |||||
* | | | \ | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -6/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Small CMake fixes : | Vladislav Vaintroub | 2011-05-15 | 1 | -6/+4 |
* | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+2 |
* | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 1 | -1/+1 |
| | |/ | |||||
* | | | CMake/code signing: | Vladislav Vaintroub | 2011-03-28 | 1 | -5/+2 |
* | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -10/+4 |
* | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
|\ \ \ | |/ / | |||||
| * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
* | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+8 |
* | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+2 |
|/ / | |||||
* | | Fix windows build: add strmov_overlapp.c to CMakeLists.txt | Sergey Petrunya | 2009-09-10 | 1 | -1/+1 |
* | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-02-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-11-26 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fixes to merge between 5.1-main and 5.1-marvel | unknown | 2007-10-16 | 1 | -1/+1 |
* | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fixes for windows builds | unknown | 2007-12-13 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1 | unknown | 2007-12-13 | 1 | -3/+0 |
|\ \ \ | |||||
| * \ \ | Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445 | unknown | 2007-11-22 | 1 | -3/+0 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fix for bug #32221: bug25714, mytest, mysql_client_test complaints and | unknown | 2007-11-19 | 1 | -3/+0 |
* | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51 | unknown | 2007-12-05 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint | unknown | 2007-10-22 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fixed the Windows build failures introduced by the patch for bug #31207: Test... | unknown | 2007-10-22 | 1 | -1/+1 |
| | |/ | |||||
* | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50-fix | unknown | 2007-11-09 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix Windows build problems. | unknown | 2007-11-09 | 1 | -1/+1 |
| |/ | |||||
* | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js: | unknown | 2007-08-06 | 1 | -12/+13 |
* | | Post Merge Fixup. | unknown | 2007-08-04 | 1 | -14/+14 |
* | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build | unknown | 2007-08-04 | 1 | -14/+41 |
|\ \ | |/ | |||||
| * | CMakeLists.txt, README, configure.js | unknown | 2007-08-03 | 1 | -14/+42 |
| * | CMakeLists.txt (several), make_win_bin_dist: | unknown | 2007-08-02 | 1 | -16/+43 |
| * | bug#28358 libmysql.dll cannot be dynamically loaded on Windows | unknown | 2007-05-14 | 1 | -0/+4 |
| * | Bug#24732 Executables do not include Vista manifests | unknown | 2007-04-23 | 1 | -0/+5 |
| * | my_strtoll10-x86.s: | unknown | 2006-12-31 | 1 | -0/+15 |
| * | Additional files for cmake support | unknown | 2006-08-31 | 1 | -0/+54 |
* | merge fix | unknown | 2007-08-03 | 1 | -1/+2 |
* | Re-apply fixes originally made by Kent, | unknown | 2007-08-03 | 1 | -13/+43 |
* | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files. | unknown | 2007-07-31 | 1 | -0/+0 |
* | Bug#24732 Executables do not include Vista manifests | unknown | 2007-04-23 | 1 | -0/+6 |