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

	Commit message (Expand)	Author	Age	Files	Lines
*	5.5-merge	Sergei Golubchik	2011-07-02	1	-1/+90
\|\
\| *	merge mysql-5.1->mysql-5.5	Georgi Kodinov	2011-03-28	1	-27/+0
\| \|\
\| \| *	Fixed a test failure in embedded because of the fix for BUG#11766769	Georgi Kodinov	2011-03-28	1	-25/+0
\| * \|	5.1 -> 5.5 merge	Sergey Glukhov	2011-03-28	1	-0/+13
\| \|\ \ \| \| \|/
\| \| *	Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0...	Sergey Glukhov	2011-03-28	1	-0/+13
\| * \|	Merged bug #11766769 to 5.5.	Georgi Kodinov	2011-03-25	1	-0/+28
\| \|\ \ \| \| \|/
\| \| *	Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET	Georgi Kodinov	2011-03-25	1	-0/+26
\| * \|	Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial	Dmitry Shulga	2011-03-15	1	-0/+5
\| \|\ \ \| \| \|/
\| \| *	Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".	Dmitry Shulga	2011-03-15	1	-0/+5
\| * \|	Bug #59884: setting charset to 2048 crashes	Georgi Kodinov	2011-02-10	1	-0/+26
\| * \|	merge	Georgi Kodinov	2011-02-02	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	merge to 5.1.	Georgi Kodinov	2011-02-02	1	-1/+1
\| \| \|\
\| \| \| *	Fixes for Bug #55755 and Bug #52315 part 2	Georgi Kodinov	2011-02-02	1	-1/+1
\| * \| \|	merge some docs changes and a test case; null merge the code.	Tatiana A. Nurnberg	2010-11-25	1	-0/+44
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Assorted post-merge fixes, clean-up, integration, compat with 5.6.	Tatiana A. Nurnberg	2010-11-25	1	-1/+4
\| \| * \|	Bug#43233: Some server variables are clipped during "update," not "check" stage	Tatiana A. Nurnberg	2010-11-11	1	-0/+41
* \| \| \|	lots of post-merge changes	Sergei Golubchik	2011-04-25	1	-0/+2
* \| \| \|	merge.	Sergei Golubchik	2010-11-25	1	-12/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Merge with MySQL 5.1.49	Michael Widenius	2010-08-02	1	-1/+16
\| \|\ \ \ \| \| \|/ /
\| * \| \|	Merge MySQL 5.1.46 into MariaDB.	unknown	2010-04-28	1	-0/+8
\| \|\ \ \
\| * \ \ \	Merge MySQL 5.1.44 into MariaDB.	unknown	2010-03-04	1	-0/+6
\| \|\ \ \ \
\| * \| \| \| \|	Fix multiple test suite failures in Buildbot due to races in the test cases o...	unknown	2010-01-11	1	-10/+0
\| * \| \| \| \|	Merge MySQL->MariaDB	Sergey Petrunya	2009-09-08	1	-0/+25
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merged with mysql-5.1 tree.	Michael Widenius	2009-04-25	1	-0/+15
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	bzr merge from guilhem's maria tree to our local 5.1	Michael Widenius	2009-04-25	1	-8/+116
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge with mysql-maria tree	Michael Widenius	2009-02-19	1	-44/+47
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge with base MySQL 5.1	Michael Widenius	2009-02-15	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \|	A pre-requisite patch for the fix for Bug#52044.	Konstantin Osipov	2010-07-27	1	-0/+26
* \| \| \| \| \| \| \| \| \| \|	merge	Georgi Kodinov	2010-06-04	1	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	merge	Georgi Kodinov	2010-06-04	1	-0/+15
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Bug #52315: utc_date() crashes when system time > year 2037	Georgi Kodinov	2010-06-04	1	-0/+14
* \| \| \| \| \| \| \| \| \|	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	Alexey Kopytov	2010-04-03	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Bug #37168: Missing variable - skip_name_resolve	Georgi Kodinov	2010-03-31	1	-0/+8
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Auto-merge from mysql-next-mr.	Alexander Nozdrin	2010-02-20	1	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Followup to Bug#45225 Locking: hang if drop table with no timeout	Jon Olav Hauglid	2010-02-15	1	-2/+2
* \| \| \| \| \| \| \| \| \|	WL#5154 Remove deprecated 4.1 features	Magne Mahre	2010-02-17	1	-1/+0
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	WL#4738 streamline/simplify @@variable creation process	Sergei Golubchik	2009-12-22	1	-24/+13
* \| \| \| \| \| \| \| \|	Automerge from mysql-5.1-bugteam to mysql-trunk-merge.	Alexey Kopytov	2009-12-17	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	merge mysql-5.0-bugteam to mysql-5.1-bugteam	Satya B	2009-12-17	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()	Satya B	2009-12-17	1	-0/+6
\| \| * \| \| \| \| \|	Bug #32223 SETting max_allowed_packet variable	Staale Smedseng	2009-06-19	1	-8/+13
* \| \| \| \| \| \| \|	Automerge from mysql-next-mr.	Alexander Nozdrin	2009-10-22	1	-10/+10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	WL#751 Error message construction, backport	Sergey Glukhov	2009-10-15	1	-5/+5
\| * \| \| \| \| \| \| \|	Backporting WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT	Alexander Barkov	2009-10-06	1	-2/+2
\| * \| \| \| \| \| \| \|	WL#4584 Internationalized number format	Alexander Barkov	2009-10-05	1	-3/+3
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	A backport a patch of Bug#34828.	Alexander Nozdrin	2009-10-07	1	-0/+162
\|/ / / / / / /
* \| \| \| \| \| \|	merge to 5.1-bugteam tree	Satya B	2009-06-02	1	-0/+9
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix for BUG#10206 - InnoDB: Transaction requiring Max_BinLog_Cache_size > 4GB	Satya B	2009-05-15	1	-0/+9
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Bug #42778: delete order by null global variable causes	Gleb Shchepa	2009-05-22	1	-3/+0
* \| \| \| \| \| \|	Bug #42778: delete order by null global variable causes	Gleb Shchepa	2009-05-22	1	-0/+19
\|/ / / / / /