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

	Commit message (Expand)	Author	Age	Files	Lines
*	MDEV-4011 Added per thread memory counting and usage	Michael Widenius	2013-01-23	1	-4/+2
*	Merge from 5.3	unknown	2012-08-24	1	-8/+17
\|\
\| *	merge from 5.2	unknown	2012-08-24	1	-8/+17
\| \|\
\| \| *	Merge from 5.1.	unknown	2012-08-24	1	-8/+17
\| \| \|\
\| \| \| *	MDEV-382: Incorrect quoting	unknown	2012-08-24	1	-8/+17
* \| \| \|	5.3 merge	Sergei Golubchik	2012-01-13	1	-2/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge with 5.2.	Michael Widenius	2011-12-11	1	-7/+8
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge with MariaDB 5.1	Michael Widenius	2011-11-24	1	-7/+8
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	Michael Widenius	2011-11-21	1	-7/+8
\| \| \| \|\
\| \| \| \| *	Updated/added copyright headers	Kent Boortz	2011-07-03	1	-7/+8
\| \| \| \| \|\
* \| \| \| \| \	5.3->5.5 merge	Sergei Golubchik	2011-11-22	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Added new options to KILL. New syntax is KILL [HARD\|SOFT] [CONNECTION\|QUERY] ...	Michael Widenius	2011-09-23	1	-1/+1
\| \|/ / / /
\| * \| \| \|	pluggable auth with plugin examples	Sergei Golubchik	2010-03-29	1	-1/+1
\| \|/ / /
\| * \| \|	Merge with MySQL 5.1, with following additions:	unknown	2009-11-16	1	-7/+10
\| \|\ \ \ \| \| \|/ /
\| * \| \|	Merge MySQL->MariaDB	Sergey Petrunya	2009-09-08	1	-22/+21
\| \|\ \ \
\| * \ \ \	Merge with base MySQL 5.1	Michael Widenius	2009-02-15	1	-8/+11
\| \|\ \ \ \
\| * \| \| \| \|	WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...	Michael Widenius	2008-12-03	1	-1/+3
* \| \| \| \| \|	Updated/added copyright headers	Kent Boortz	2011-07-04	1	-2/+4
* \| \| \| \| \|	Merge from 5.1.	Guilhem Bichot	2011-05-21	1	-7/+8
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.	Guilhem Bichot	2011-05-16	1	-7/+8
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	merge of mysql-5.5 into mysql-5.5-wl1054	Georgi Kodinov	2010-09-20	1	-37/+12
\|\ \ \ \ \
\| * \ \ \ \	Commit on behalf of Dmitry Lenev.	Konstantin Osipov	2010-08-12	1	-8/+8
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix for bug #52044 "FLUSH TABLES WITH READ LOCK and FLUSH	Dmitry Lenev	2010-07-27	1	-6/+6
\| * \| \| \| \| \|	A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()".	Konstantin Osipov	2010-08-09	1	-35/+10
* \| \| \| \| \| \|	WL#1054: Pluggable authentication support	Georgi Kodinov	2010-08-09	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Fix a compilation failure of ha_ndbcluster_binlog.cc.	Konstantin Osipov	2010-07-29	1	-0/+1
\|/ / / / /
* \| \| \| \|	A pre-requisite patch for the fix for Bug#52044.	Konstantin Osipov	2010-07-27	1	-7/+12
* \| \| \| \|	Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled	Davi Arnaut	2010-07-08	1	-9/+9
* \| \| \| \|	Merge trunk-bugfixing -> trunk-runtime	Konstantin Osipov	2010-06-17	1	-2/+3
\|\ \ \ \ \
\| * \| \| \| \|	Fixed ha_ndbcluster_binlog.cc to use Parser_state::init().	Alexey Kopytov	2010-06-12	1	-2/+3
* \| \| \| \| \|	A pre-requisite for WL#5419 "LOCK_open scalability:	Konstantin Osipov	2010-06-10	1	-3/+2
\|/ / / / /
* \| \| \| \|	Follow-up patch for Bug#27863 (excessive memory usage for many small queries	Alexander Nozdrin	2010-05-17	1	-2/+4
* \| \| \| \|	Patch for Bug#27863 (excessive memory usage for many small queries in a	Alexander Nozdrin	2010-05-14	1	-2/+2
* \| \| \| \|	WL#5030: Split and remove mysql_priv.h	Mats Kindahl	2010-03-31	1	-1/+10
* \| \| \| \|	A review comment for the fix for Bug#46672.	Konstantin Osipov	2010-03-13	1	-2/+0
* \| \| \| \|	Followup to Bug#45225 Locking: hang if drop table with no timeout	Jon Olav Hauglid	2010-02-24	1	-1/+3
* \| \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-05	1	-1/+3
\|\ \ \ \ \
\| * \ \ \ \	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-14	1	-4/+4
\| \|\ \ \ \ \
\| * \ \ \ \ \	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-13	1	-129/+133
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Manual merge from next-mr.	unknown	2010-01-12	1	-37/+43
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-07	1	-1/+3
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...	Andrei Elkin	2009-11-30	1	-4/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...	Andrei Elkin	2009-11-10	1	-3/+6
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	WL#2687 WL#5072 BUG#40278 BUG#47175	Alfranio Correia	2009-11-03	1	-1/+1
\| \| * \| \| \| \| \| \| \| \|	merged fixes for BUG#39934 to 5.1-rpl+3	Sven Sandberg	2009-09-30	1	-0/+2
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merged fix for BUG#39934 up a few revisions.	Sven Sandberg	2009-07-14	1	-0/+2
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	BUG#39934: Slave stops for engine that only support row-based logging	Sven Sandberg	2009-07-14	1	-0/+2
* \| \| \| \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284-merge.	Konstantin Osipov	2010-02-04	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	WL#2360 Performance schema	Marc Alff	2010-01-11	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284	Konstantin Osipov	2010-02-03	1	-129/+133
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /