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

	Commit message (Expand)	Author	Age	Files	Lines
*	Bug#11764503 (Bug#57341) Query in EXPLAIN EXTENDED shows wrong characters	Alexander Barkov	2011-03-04	1	-1/+2
*	weave merge from mysql-5.1 to mysql-5.5	Georgi Kodinov	2011-02-08	1	-1/+1
\|\
\| *	Updating header copyright/README in source for 2011	Karen Langford	2011-01-25	1	-1/+1
* \|	Merged fix for bug #58499 "DEFINER-security view selecting from	Dmitry Lenev	2011-01-12	1	-14/+28
\|\ \ \| \|/
\| *	Fix for bug #58499 "DEFINER-security view selecting from	Dmitry Lenev	2011-01-12	1	-14/+28
* \|	5.1-bugteam->5.5-bugteam merge	Sergey Glukhov	2010-12-14	1	-1/+1
\|\ \ \| \|/
\| *	Fixed following problems:	Sergey Glukhov	2010-12-14	1	-1/+1
\| *	Manual merge from the bugfix tree.	Alexey Kopytov	2010-06-11	1	-3/+4
\| \|\
* \| \|	Patch that refactors global read lock implementation and fixes	Dmitry Lenev	2010-11-11	1	-9/+1
* \| \|	Merge from mysql-5.5-bugfixing to mysql-5.5-runtime	Jon Olav Hauglid	2010-08-18	1	-2/+0
\|\ \ \
\| * \| \|	WL#5370 Keep forward-compatibility when changing		2010-08-18	1	-2/+0
* \| \| \|	A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()".	Konstantin Osipov	2010-08-09	1	-15/+5
\|/ / /
* \| \|	A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE	Jon Olav Hauglid	2010-07-01	1	-3/+4
* \| \|	Merge trunk-bugfixing -> trunk-runtime	Konstantin Osipov	2010-06-17	1	-7/+7
\|\ \ \
\| * \ \	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.	Alexey Kopytov	2010-06-11	1	-3/+4
\| \|\ \ \
\| \| * \ \	Manual merge from the bugfix tree.	Alexey Kopytov	2010-06-11	1	-3/+4
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| / \| \| \| \|/
\| \| \| *	Bug #42064: low memory crash when importing hex strings, in	Alexey Kopytov	2010-05-21	1	-3/+4
\| * \| \|	Merge of mysql-5.1-bugteam into mysql-trunk-merge.	Davi Arnaut	2010-06-10	1	-4/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Bug#42733: Type-punning warnings when compiling MySQL --	Davi Arnaut	2010-06-10	1	-4/+3
\| \| \|/
* \| \|	Bug#42643: InnoDB does not support replication of TRUNCATE TABLE	Davi Arnaut	2010-05-25	1	-49/+2
* \| \|	Pre-requisite patch for bug #51263 "Deadlock between	Dmitry Lenev	2010-05-25	1	-1/+1
\|/ /
* \|	WL#5030: Splitting mysql_priv.h	Mats Kindahl	2010-04-07	1	-0/+1
* \|	WL#5030: Split and remove mysql_priv.h	Mats Kindahl	2010-03-31	1	-1/+11
* \|	Manual merge of mysql-trunk into mysql-trunk-merge.	Alexey Kopytov	2010-03-24	1	-78/+111
\|\ \
\| * \	Manual merge from mysql-next-mr.	Alexander Nozdrin	2010-03-02	1	-8/+5
\| \|\ \
\| \| * \	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2010-02-24	1	-8/+5
\| \| \|\ \
\| * \| \| \|	Followup to Bug#45225 Locking: hang if drop table with no timeout	Jon Olav Hauglid	2010-02-24	1	-1/+1
\| \|/ / /
\| * \| \|	Fix for bug #50913 "Deadlock between open_and_lock_tables_derived	Dmitry Lenev	2010-02-08	1	-0/+4
\| * \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-05	1	-3/+3
\| \|\ \ \
\| \| * \ \	Auto-merge from mysql-next-mr.	Alexander Nozdrin	2010-01-21	1	-3/+3
\| \| \|\ \ \
\| \| \| * \ \	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-13	1	-11/+18
\| \| \| \|\ \ \
\| \| \| * \ \ \	Manual merge from next-mr.		2010-01-12	1	-9/+0
\| \| \| \|\ \ \ \
\| \| \| * \ \ \ \	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-07	1	-3/+3
\| \| \| \|\ \ \ \ \
\| \| \| \| * \ \ \ \	mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...	Andrei Elkin	2009-11-30	1	-1/+1
\| \| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \| \|	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	-2/+2
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| \| * \| \| \| \| \|	BUG#39934: Slave stops for engine that only support row-based logging	Sven Sandberg	2009-07-22	1	-2/+2
\| * \| \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-04	1	-3/+5
\| * \| \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-04	1	-7/+10
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	backported:	Sergey Glukhov	2010-01-15	1	-7/+10
\| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284	Konstantin Osipov	2010-02-03	1	-9/+16
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	WL#2360 Performance schema	Marc Alff	2010-01-06	1	-11/+18
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-03	1	-9/+0
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	WL#4738 streamline/simplify @@variable creation process	Sergei Golubchik	2009-12-22	1	-9/+0
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-02	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Manual merge from mysql-next-mr.	Alexander Nozdrin	2009-12-17	1	-5/+5
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2009-12-16	1	-1/+1
\| \| \|\ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-02	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge cleanup	Marc Alff	2009-12-11	1	-1/+1
\| \| * \| \| \| \| \| \| \|	Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc	Marc Alff	2009-12-11	1	-4/+7
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / /