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

	Commit message (Expand)	Author	Age	Files	Lines
*	merge.	Sergei Golubchik	2010-11-25	1	-33/+20
\|\
\| *	Automatic merge with MariaDB 5.1	Michael Widenius	2010-11-04	1	-1/+1
\| \|\
\| \| *	MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge thread	unknown	2010-11-03	1	-1/+1
\| * \|	merge with 5.1	Sergei Golubchik	2010-09-11	1	-4/+11
\| \|\ \ \| \| \|/
\| \| *	Merge with MySQL 5.1.50	Michael Widenius	2010-08-27	1	-4/+11
\| \| \|\
\| * \| \	merge 5.1->5.2	Sergei Golubchik	2010-06-01	1	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge MySQL 5.1.46 into MariaDB.	unknown	2010-04-28	1	-2/+2
\| \| \|\ \
\| * \| \| \|	pluggable auth with plugin examples	Sergei Golubchik	2010-03-29	1	-18/+0
\| \|/ / /
\| * \| \|	Merge MySQL->MariaDB	Sergey Petrunya	2009-09-08	1	-40/+90
\| \|\ \ \
\| * \| \| \|	Added MY_CS_NONASCII marker for character sets that are not compatible with l...	Michael Widenius	2009-07-02	1	-4/+63
\| * \| \| \|	merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except	Guilhem Bichot	2009-04-01	1	-6/+17
\| \|\ \ \ \
\| * \| \| \| \|	Fixed warnings and errors discovered by pushbuild2	Michael Widenius	2008-12-04	1	-2/+3
\| * \| \| \| \|	WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...	Michael Widenius	2008-12-03	1	-2/+2
\| * \| \| \| \|	Merged 5.1 with maria 5.1	Michael Widenius	2008-10-10	1	-0/+3
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-maria	unknown	2008-05-29	1	-0/+2
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"	unknown	2008-05-29	1	-0/+2
* \| \| \| \| \| \| \|	Auto-merge from mysql-trunk-merge.	Alexander Nozdrin	2010-07-29	1	-5/+11
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge of mysql-5.1-bugteam into mysql-trunk-merge.	Davi Arnaut	2010-07-23	1	-5/+11
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge 5.1-bugteam -> 5.1-bug-42496	Dmitry Shulga	2010-07-23	1	-15/+9
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Fixed bug #42496 - the server could crash on a debug assert after a failure	Dmitry Shulga	2010-07-21	1	-4/+11
\| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	WL#5498: Remove dead and unused source code	Davi Arnaut	2010-07-23	1	-25/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge of mysql-5.1-bugteam into mysql-trunk-merge.	Davi Arnaut	2010-07-09	1	-15/+9
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bug#45288: pb2 returns a lot of compilation warnings on linux	Davi Arnaut	2010-07-09	1	-15/+9
\| \|/ / / / / /
* \| \| \| \| \| \|	Bug#52520 Difference in tinytext utf column metadata	Alexander Barkov	2010-06-02	1	-5/+3
* \| \| \| \| \| \|	Manual merge from mysql-trunk.	Alexander Nozdrin	2010-05-20	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect	Alexander Nozdrin	2010-05-14	1	-1/+1
* \| \| \| \| \| \| \|	Manual merge of mysql-5.1-bugteam to	Alexey Kopytov	2010-04-19	1	-1/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	WL#5030: Split and remove mysql_priv.h	Mats Kindahl	2010-03-31	1	-1/+4
* \| \| \| \| \| \| \|	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	Alexey Kopytov	2010-04-02	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| / / / / / / \| \|/ / / / / /
\| * \| \| \| \| \|	Bug #52304 valgrind does not like to print un-inited string in Protocol_tex...	Andrei Elkin	2010-03-23	1	-1/+1
* \| \| \| \| \| \|	Manual merge of mysql-trunk into mysql-trunk-merge.	Alexey Kopytov	2010-03-24	1	-4/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	WL#2649 Number-to-string conversions	Alexander Barkov	2010-02-11	1	-2/+2
\| * \| \| \| \| \| \|	Bug #49130 Running mtr tests with valgrind and debug produces lots of warnings	Tor Didriksen	2009-12-02	1	-2/+2
\| * \| \| \| \| \| \|	Manual merge/pull from mysql-next-mr.	Alexander Nozdrin	2009-11-25	1	-0/+3
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Backport of:	Konstantin Osipov	2009-11-24	1	-0/+3
\| * \| \| \| \| \| \| \|	merge of bug#35765 into mysql-next-mr-bugfixing	Mattias Jonsson	2009-11-24	1	-2/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	Alexey Kopytov	2010-03-20	1	-3/+2
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bug #49829 Many "hides virtual function" warnings with	Staale Smedseng	2010-03-14	1	-3/+3
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	merge (and including the fix for bug#48939 since that was not included in mys...	Mattias Jonsson	2009-12-15	1	-2/+2
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge from mysql-next-mr.	Alexander Nozdrin	2009-10-23	1	-1/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	WL#751 Error message construction, backport	Sergey Glukhov	2009-10-15	1	-1/+9
* \| \| \| \| \| \|	Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,	Konstantin Osipov	2009-10-22	1	-31/+249
* \| \| \| \| \| \|	Backport to 5.4 the following changesets:	Konstantin Osipov	2009-10-09	1	-18/+10
\|/ / / / / /
* \| \| \| \| \|	Backporting WL#3759 Optimize identifier conversion in client-server protocol	Alexander Barkov	2009-09-30	1	-3/+61
* \| \| \| \| \|	WL#2110 (SIGNAL)	Marc Alff	2009-09-10	1	-43/+50
\|/ / / / /
* \| \| \| \|	Bug#44521 Executing a stored procedure as a prepared statement can sometimes ...	Kristofer Pettersson	2009-07-29	1	-40/+90
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	merged 5.0-bugteam -> 5.1-bugteam.	Georgi Kodinov	2009-02-27	1	-1/+2
\|\ \ \ \
* \ \ \ \	Auto-merge	Ramil Kalimullin	2009-02-26	1	-6/+16
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| / \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix for bug#19829:make test Failed in mysql_client_test	Ramil Kalimullin	2009-02-26	1	-6/+16
\| * \| \|	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt	unknown	2007-12-01	1	-1/+4
\| \|\ \ \