summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.1Sergei Golubchik2011-10-071-1/+3
|\
| * disable feedback plugin by default. Now on windows too.Sergei Golubchik2011-10-061-1/+3
* | merge 5.2Vladislav Vaintroub2011-03-101-1/+1
|\ \
| * \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| |\ \ | | |/
| | * Fixed build failuresMichael Widenius2011-02-231-1/+1
* | | Move common functionality (analyze service configuration) into winservice lib...Vladislav Vaintroub2011-01-301-1/+4
* | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-35/+118
|/ /
* | mergeVladislav Vaintroub2010-12-061-5/+1
|\ \ | |/
| * Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-5/+1
* | Merge with 5.1Michael Widenius2010-12-041-1/+1
|\ \ | |/
| * Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-1/+1
* | fixes for buildbotSergei Golubchik2010-07-251-0/+1
* | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+5
|\ \ | |/
| * Implement an NSIS based installerBo Thorsen2010-06-251-0/+5
* | Make MariaDB compile with VS 2010Hakan Kuecuekyilmaz2010-06-241-1/+0
* | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+2
|\ \ | |/
| * Merge with MySQL 5.1.47Michael Widenius2010-05-261-2/+2
| |\
| | * Bug #48042 The description for Event ID ( 100 ) in Source ( MySQL ) cannot be...Vladislav Vaintroub2010-04-261-2/+2
* | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-0/+1
* | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-1/+1
* | | mwl:98 - libservicesSergei Golubchik2010-03-031-1/+1
|/ /
* | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-1/+1
* | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+1
|\ \ | |/
| * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+1
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-3/+3
|\ \
| * \ MergeSergey Petrunya2009-09-021-2/+3
| |\ \
| | * | Trivial fixes for windows compile failuresSergey Petrunya2009-09-011-2/+3
| * | | MWL#17: Table eliminationSergey Petrunia2009-06-251-1/+1
| |/ /
| * | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-12/+2
| |\ \
| * \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-3/+3
| |\ \ \
| * \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-2/+2
| |\ \ \ \
| * | | | | Windows fixesunknown2008-01-101-0/+3
* | | | | | MySQL 5.1 -> MariaDB 5.1 merge: windows build fixesSergey Petrunya2009-09-151-1/+2
| |_|_|_|/ |/| | | |
* | | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-44/+36
| |_|_|/ |/| | |
* | | | merge fix for Bug40280 from 5.0Vladislav Vaintroub2008-10-231-12/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.Vladislav Vaintroub2008-10-231-12/+3
* | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-181-1/+1
* | | | fixed the win32 make files to compile the fix for bug 35997unknown2008-05-121-2/+2
| |_|/ |/| |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-211-1/+1
|\ \ \
| * | | Bug#31929 Windows build fails with >=4 Parallel build threads.unknown2008-01-291-1/+1
* | | | Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2unknown2008-02-191-1/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Bug#31745 - crash handler does not work on Windowsunknown2008-02-191-1/+1
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-141-0/+2
|\ \ \ | | |/ | |/|
| * | fix for 2.4.6 bug should be properly enclosed to not break other versions.unknown2007-11-021-0/+2
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-171-41/+65
|\ \ \ | |/ /
| * | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildunknown2007-08-291-1/+1
| |\ \ | | |/
| | * CMakeLists.txt:unknown2007-08-291-1/+1
| * | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:unknown2007-08-061-45/+62
| * | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newunknown2007-08-031-1/+1
| |\ \ | | |/
| | * CMakeLists.txt, README, configure.jsunknown2007-08-031-1/+1