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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge 5.5->5.5-mwl248	Igor Babaev	2012-08-14	1	-2/+2
\|\
\| *	merge with MySQL 5.5.27	Sergei Golubchik	2012-08-09	1	-2/+2
\| \|\
\| \| *	mysql_client_test did not build within limbysqld/examples	Bjorn Munch	2012-07-10	1	-0/+1
\| \| \|\
\| \| \| *	mysql_client_test did not build within limbysqld/examples	Bjorn Munch	2012-07-10	2	-2/+4
* \| \| \|	Merge	Igor Babaev	2012-06-01	3	-3/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	Building RPMs with CPack	Sergei Golubchik	2012-05-22	2	-3/+3
\| * \| \|	c	Sergei Golubchik	2012-05-21	1	-0/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLD	Mayank Prasad	2012-04-06	1	-0/+2
\| \| \|\ \ \| \| \| \|/
\| \| \| *	BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLD	Mayank Prasad	2012-04-06	1	-0/+2
* \| \| \|	Merge 5.5 -> 5.5-mwl248.	Igor Babaev	2012-04-11	2	-3/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	mysql-5.5.22 merge	Sergei Golubchik	2012-03-28	2	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Updated/added copyright headers	MySQL Build Team	2012-02-16	2	-2/+2
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Updated/added copyright headers	Kent Boortz	2012-02-15	1	-2/+1
\| \| \| \|\
\| * \| \| \|	MDEV-15 Log all sql errors.	Alexey Botchkov	2012-03-24	1	-1/+0
* \| \| \| \|	Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.	Igor Babaev	2012-03-19	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Merged 5.3 changes into the mwl #248 tree.	Igor Babaev	2012-03-09	1	-0/+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	-0/+1
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \|/ / \| \| \| \| \| \|/\| \|
\| \| \| \| \| * \| \|	Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS	Tor Didriksen	2011-11-30	1	-0/+1
\| * \| \| \| \| \| \|	The main patch for the MWL#248 back-ported from	Igor Babaev	2012-01-04	1	-0/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Reduce size of windows MSI by approx. 50%	Vladislav Vaintroub	2012-03-16	1	-3/+6
* \| \| \| \| \| \|	Fix compile error - linker does not find extern variables, in sql_logger.c	Vladislav Vaintroub	2012-03-15	1	-1/+1
* \| \| \| \| \| \|	MDEV-15 Log SQL errors.	Alexey Botchkov	2012-03-14	1	-0/+1
* \| \| \| \| \| \|	Merge MWL#192: Non-blocking client library, into MariaDB 5.5.	unknown	2012-02-21	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	MWL#192: Non-blocking client API for libmysqlclient.	unknown	2011-09-20	2	-1/+2
* \| \| \| \| \| \| \|	mysql-5.5 merge	Sergei Golubchik	2012-01-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS	Tor Didriksen	2011-12-02	1	-0/+1
* \| \| \| \| \| \| \|	5.3 merge	Sergei Golubchik	2012-01-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	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	11	-13/+110
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge with MariaDB 5.1	Michael Widenius	2011-11-24	11	-13/+110
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| \| * \| \| \| \|	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	Michael Widenius	2011-11-21	11	-13/+110
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|_\|/ / \| \| \| \| \|/\| \| \|
\| \| \| \| * \| \| \|	Updated/added copyright headers	Kent Boortz	2011-07-03	1	-2/+26
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \| \| \|	Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED	Mayank Prasad	2011-05-18	1	-2/+26
* \| \| \| \| \| \| \| \|	always use sql/sql_string.* files, never - client/sql_string.*	Sergei Golubchik	2011-12-15	1	-0/+1
* \| \| \| \| \| \| \| \|	new configure option: NOT_FOR_DISTRIBUTION	Sergei Golubchik	2011-12-14	1	-3/+2
* \| \| \| \| \| \| \| \|	merged	Sergei Golubchik	2011-11-27	1	-0/+3
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Avoid mysqld dependency on libaio.so by linking xtradb statically to libaio.	Vladislav Vaintroub	2011-11-25	1	-0/+3
* \| \| \| \| \| \| \| \| \|	5.3->5.5 merge	Sergei Golubchik	2011-11-27	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| / / / / / / / / \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	merging.	Alexey Botchkov	2011-11-12	1	-15/+12
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	merge	Sergei Golubchik	2011-10-11	1	-15/+12
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	merge with 5.1	Sergei Golubchik	2011-10-07	1	-15/+12
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| / / \| \| \| \| \|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \|
\| \| \| \| * \| \| \| \|	support for plugins on windows	Sergei Golubchik	2011-10-04	1	-15/+12
\| * \| \| \| \| \| \| \|	gis-related tests fixes.	Alexey Botchkov	2011-06-20	4	-3/+5
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Precise GIS functions added.	Alexey Botchkov	2011-05-04	2	-0/+2
* \| \| \| \| \| \| \| \|	merged	Sergei Golubchik	2011-11-22	11	-21/+81
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	few cmake/compiler warnings	Sergei Golubchik	2011-11-03	1	-2/+1
\| * \| \| \| \| \| \| \| \|	merge	Sergei Golubchik	2011-11-03	1	-2/+3
\| \|\ \ \ \ \ \ \ \ \