delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \|	merge 5.2	Vladislav Vaintroub	2011-03-10	1	-1/+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
* \| \| \| \| \| \| \| \| \|	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	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	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
* \| \| \| \| \| \| \| \|	fixes for buildbot	Sergei Golubchik	2010-07-25	1	-0/+1
* \| \| \| \| \| \| \| \|	Automerge MariaDB 5.1->5.2.	unknown	2010-07-09	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Implement an NSIS based installer	Bo Thorsen	2010-06-25	1	-0/+5
* \| \| \| \| \| \| \| \|	Make MariaDB compile with VS 2010	Hakan Kuecuekyilmaz	2010-06-24	1	-1/+0
* \| \| \| \| \| \| \| \|	merge 5.1->5.2	Sergei Golubchik	2010-06-01	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge with MySQL 5.1.47	Michael Widenius	2010-05-26	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Bug #48042 The description for Event ID ( 100 ) in Source ( MySQL ) cannot be...	Vladislav Vaintroub	2010-04-26	1	-2/+2
* \| \| \| \| \| \| \| \|	MWL#43 CREATE TABLE options (by Sanja)	Sergei Golubchik	2010-04-08	1	-0/+1
* \| \| \| \| \| \| \| \|	pluggable auth with plugin examples	Sergei Golubchik	2010-03-29	1	-1/+1
* \| \| \| \| \| \| \| \|	mwl:98 - libservices	Sergei Golubchik	2010-03-03	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Patch set contributed by Alex Budovski (MCA)	Michael Widenius	2010-01-29	1	-1/+1
* \| \| \| \| \| \| \|	Merge with MySQL 5.1, with following additions:	unknown	2009-11-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	WL#4259 - Debug Sync Facility	Ingo Struewing	2009-09-29	1	-0/+1
* \| \| \| \| \| \| \|	Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge	Sergey Petrunya	2009-09-15	1	-3/+3
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge	Sergey Petrunya	2009-09-02	1	-2/+3
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Trivial fixes for windows compile failures	Sergey Petrunya	2009-09-01	1	-2/+3
\| * \| \| \| \| \| \| \| \|	MWL#17: Table elimination	Sergey Petrunia	2009-06-25	1	-1/+1
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...	Guilhem Bichot	2008-11-21	1	-12/+2
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merged 5.1 with maria 5.1	Michael Widenius	2008-10-10	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge mysql.com:/home/my/mysql-5.1	unknown	2008-04-28	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Windows fixes	unknown	2008-01-10	1	-0/+3
* \| \| \| \| \| \| \| \| \| \| \|	MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes	Sergey Petrunya	2009-09-15	1	-1/+2
\| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Backport WL#3653 to 5.1 to enable bundled innodb plugin.	Vladislav Vaintroub	2009-06-10	1	-44/+36
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	merge fix for Bug40280 from 5.0	Vladislav Vaintroub	2008-10-23	1	-12/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.	Vladislav Vaintroub	2008-10-23	1	-12/+3
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Bug#37003 Tests sporadically crashes with embedded server	Davi Arnaut	2008-06-18	1	-1/+1
* \| \| \| \| \| \| \|	fixed the win32 make files to compile the fix for bug 35997	unknown	2008-05-12	1	-2/+2
\| \|_\|/ / / / / \|/\| \| \| \| \| \|