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

	Commit message (Expand)	Author	Age	Files	Lines
*	Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial	Dmitry Shulga	2011-03-15	1	-0/+5
*	Fix for BUG#59432 "--autocommit=on does not work (@@global.autocommit is 0)"	Guilhem Bichot	2011-01-14	1	-0/+2
*	Post-push fix for BUG#57275.	Alfranio Correia	2010-12-06	1	-6/+14
*	Fix for BUG#57316 "It is not clear how to disable autocommit"	Guilhem Bichot	2010-11-05	1	-0/+1
*	fixed failing test cases	Georgi Kodinov	2010-10-05	1	-1/+0
*	Auto-merge from mysql-5.5-merge.	Alexander Nozdrin	2010-08-30	1	-3/+3
\|\
\| *	Update result files.	Alexander Nozdrin	2010-08-28	1	-3/+3
* \|	WL#5363: Thread pool interface	Mats Kindahl	2010-08-18	1	-1/+1
\|/
*	WL#5349 Change default storage engine to InnoDB	Magne Mahre	2010-06-17	1	-1/+1
*	Some post-merge fixes afer a merge from mysql-5.1-bugteam.	Alexey Kopytov	2010-04-11	1	-0/+1
*	Fixed mysqld--help-win broken by the merge from trunk main.	Alexey Kopytov	2010-03-24	1	-1/+1
*	A follow-up on WL#5154 and WL#5182: remove forgotten options.	Alexander Nozdrin	2010-03-03	1	-6/+1
*	Manual merge from mysql-next-mr.	Alexander Nozdrin	2010-03-02	1	-18/+20
\|\
\| *	Fix mysqld--help-notwin.result.	Alexander Nozdrin	2010-02-25	1	-18/+20
* \|	WL#5252: Deprecate --optimizer_search_depth=63	Roy Lyseng	2010-03-01	1	-2/+3
\|/
*	Manual merge from mysql-next-mr.	Alexander Nozdrin	2010-02-22	1	-955/+940
\|\
\| *	merge	Vladislav Vaintroub	2010-02-16	1	-5/+4
\| \|\
\| * \	merge	Vladislav Vaintroub	2010-02-06	1	-0/+9
\| \|\ \
\| * \ \	merge	Vladislav Vaintroub	2010-01-18	1	-0/+7
\| \|\ \ \
\| * \ \ \	merge	Vladislav Vaintroub	2010-01-14	1	-0/+48
\| \|\ \ \ \
\| * \ \ \ \	merge	Vladislav Vaintroub	2010-01-13	1	-7/+6
\| \|\ \ \ \ \
\| * \| \| \| \| \|	remove table formatting (squeeze many spaces into one)	Vladislav Vaintroub	2010-01-06	1	-920/+918
\| * \| \| \| \| \|	Fix mysqld--help to ignore optional engines	Vladislav Vaintroub	2010-01-05	1	-13/+0
\| * \| \| \| \| \|	merge	Vladislav Vaintroub	2009-12-25	1	-1/+1
* \| \| \| \| \| \|	Auto-merge from mysql-next-mr.	Alexander Nozdrin	2010-02-20	1	-5/+4
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Followup to Bug#45225 Locking: hang if drop table with no timeout	Jon Olav Hauglid	2010-02-15	1	-5/+0
\| * \| \| \| \| \|	Bug #45225 Locking: hang if drop table with no timeout	Jon Olav Hauglid	2010-02-11	1	-0/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	WL#5182 Remove more deprecated 4.1/5.0 features	Magne Mahre	2010-02-17	1	-21/+0
* \| \| \| \| \|	WL#5154 Remove deprecated 4.1 features	Magne Mahre	2010-02-17	1	-18/+0
\|/ / / / /
* \| \| \| \|	Update test result file.	Alexander Nozdrin	2010-01-31	1	-0/+9
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Removed garbage from the mysqld--help-win	Alfranio Correia	2010-01-14	1	-1/+0
* \| \| \|	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-14	1	-217/+266
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge mysql-next-mr (revno 2958) --> mysql-next-mr-marc	Marc Alff	2010-01-12	1	-7/+6
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	WL#2360 Performance schema	Marc Alff	2010-01-11	1	-219/+267
\| \| \|/ \| \|/\|
* \| \|	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-13	1	-7/+6
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel":	Guilhem Bichot	2010-01-06	1	-3/+0
\| * \|	WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"	Guilhem Bichot	2010-01-06	1	-4/+6
\| \|/
* \|	Fixes two remaining test failures:	Luis Soares	2010-01-13	1	-0/+1
* \|	Fixes for three test failures:	Luis Soares	2010-01-12	1	-0/+6
\|/
*	don't show --ssl* option if ssl is not compiled in	Sergei Golubchik	2009-12-25	1	-16/+0
*	slightly more complete mysqld--help test	Sergei Golubchik	2009-12-24	1	-0/+7
*	WL#4738 streamline/simplify @@variable creation process	Sergei Golubchik	2009-12-22	1	-0/+953