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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge from 5.0 for 43414	Staale Smedseng	2009-08-28	1	-0/+19
\|\
\| *	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-08-28	1	-0/+13
\| *	MySQL 5.0 backport of Chad Miller's patch for Bug#34309:	Davi Arnaut	2009-05-30	1	-1/+0
* \|	Merge 5.1-bugteam -> 5.1-innodb_plugin.	Sergey Vojtovich	2009-07-14	1	-1/+1
\|\ \
\| * \|	Bug #43397 mysql headers redefine pthread_mutex_init	Staale Smedseng	2009-07-08	1	-1/+1
* \| \|	Backport WL#3653 to 5.1 to enable bundled innodb plugin.	Vladislav Vaintroub	2009-06-10	1	-0/+13
\|/ /
* \|	merge -5.0 into -5.1 (minor conflicts resolved)	Timothy Smith	2009-04-01	1	-34/+35
\|\ \ \| \|/
\| *	auto-merge -build into -bugteam	Timothy Smith	2009-04-01	1	-34/+35
\| \|\
\| \| *	cmd-line-utils/libedit/readline/readline.h	unknown	2009-03-19	1	-34/+35
\| * \|	Automerge.	Alexey Kopytov	2009-03-25	1	-2/+12
\| \|\ \ \| \| \|/ \| \|/\|
* \| \|	Manual merge.	Alexey Kopytov	2009-03-25	1	-3/+13
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can	Alexey Kopytov	2009-03-24	1	-2/+12
* \| \|	Automerge.	Alexey Kopytov	2009-02-25	1	-0/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fixed a build failure on Ubuntu 8.10 introduced by the patch	Alexey Kopytov	2009-02-25	1	-0/+3
* \| \|	Manual merge to 5.1.	Alexey Kopytov	2009-02-23	1	-2/+33
\|\ \ \ \| \|/ /
\| * \|	Fix for bug #15936: "round" differs on Windows to Unix	Alexey Kopytov	2009-02-23	1	-2/+33
\| \|/
* \|	Merge from bugteam team tree.	Chad MILLER	2009-02-10	1	-1/+3
\|\ \
\| * \|	Bug#37995 Error message truncation in test "innodb" in embedded mode.	Alexey Botchkov	2009-02-05	1	-1/+0
\| * \|	merge: 5.1 -> 5.1-rpl	Luis Soares	2009-01-23	1	-0/+3
\| \|\ \
\| * \ \	merge 5.1 --> 5.1-rpl	Alfranio Correia	2008-12-13	1	-5/+5
\| \|\ \ \
\| * \| \| \|	Fixning compiler warnings. Fixing build failure for valgrind platform.	Mats Kindahl	2008-08-22	1	-0/+3
* \| \| \| \|	Bug#34309: '_PC' macro redefinition	Chad MILLER	2009-01-27	1	-1/+0
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.	Alexey Kopytov	2008-12-07	1	-0/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	Fix for bug #27483: Casting 'scientific notation type' to 'unsigned	Alexey Kopytov	2008-12-03	1	-0/+3
\| * \|	Correct failing build.	unknown	2008-04-28	1	-2/+6
\| * \|	Merge mysql.com:/misc/mysql/mysql-5.0	unknown	2008-03-27	1	-1/+1
\| \|\ \
* \| \| \|	Bug #35999 When using the embedded server a wrong message comes.	Alexey Botchkov	2008-06-16	1	-5/+5
\| \|_\|/ \|/\| \|
* \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2008-04-19	1	-1/+1
\|\ \ \
\| * \| \|	Tentative implementation of	unknown	2008-04-08	1	-1/+1
* \| \| \|	Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main	unknown	2008-03-28	1	-0/+12
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main	unknown	2008-03-13	1	-6/+7
\| \|\ \ \
\| * \ \ \	Merge hynda.mysql.fi:/home/my/mysql-5.1-main	unknown	2008-02-27	1	-0/+12
\| \|\ \ \ \
\| \| * \ \ \	Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main	unknown	2008-02-08	1	-0/+12
\| \| \|\ \ \ \
\| \| \| * \ \ \	Merge hynda.mysql.fi:/home/my/mysql-5.1-main	unknown	2007-11-08	1	-0/+12
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1	unknown	2007-10-11	1	-0/+12
* \| \| \| \| \| \| \|	Merge mysql.com:/misc/mysql/mysql-5.1	unknown	2008-03-27	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt	unknown	2008-03-21	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)	unknown	2008-03-21	1	-1/+1
* \| \| \| \| \| \| \|	Merge trift2.:/MySQL/M51/mysql-5.1	unknown	2008-03-14	1	-6/+7
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge kaamos.(none):/data/src/mysql-5.1	unknown	2008-03-12	1	-6/+7
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix for bug #31236: Inconsistent division by zero behavior for	unknown	2008-02-20	1	-6/+7
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	Merge alf.(none):/src/macro_bugs/my50-macro_bugs	unknown	2008-02-28	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail	unknown	2008-02-28	1	-2/+2
* \| \| \| \| \| \|	Merge alf.(none):/src/macro_bugs/my50-macro_bugs	unknown	2008-02-27	1	-6/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| / / / / / \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Bug #23839 Multiple declarations of macros	unknown	2008-02-27	1	-6/+5
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	unknown	2008-02-18	1	-0/+4
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build	unknown	2007-11-30	1	-47/+25
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build	unknown	2007-11-30	1	-47/+25
\| \|\ \ \
\| \| * \| \|	my_global.h:	unknown	2007-11-30	1	-30/+25
\| \| * \| \|	Excluded verbose and bad change to Mac OS X universal binaries handling	unknown	2007-11-30	1	-18/+1