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

	Commit message (Expand)	Author	Age	Files	Lines
*	fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo)	Sergei Golubchik	2012-01-17	1	-1/+1
*	Fix some failing tests on Windows	Vladislav Vaintroub	2012-01-06	1	-2/+1
*	mysql-5.5.18 merge	Sergei Golubchik	2011-11-03	1	-14/+15
\|\
\| *	merged mysql-5.5->mysql-5.5-security	Georgi Kodinov	2011-06-06	1	-1/+1
\| \|\
\| * \	weave merge of mysql-5.5->mysql-5.5-security	Georgi Kodinov	2011-05-10	1	-1/+1
\| \|\ \
\| * \ \	merge 5.1 => 5.5 : Bug#12329653	Tor Didriksen	2011-05-05	1	-13/+14
\| \|\ \ \
\| \| * \| \|	merge 5.0 => 5.1 : Bug#12329653	Tor Didriksen	2011-05-04	1	-18/+18
* \| \| \| \|	merge with 5.3	Sergei Golubchik	2011-10-19	1	-2/+6
\|\ \ \ \ \
\| * \ \ \ \	Merge with MariaDB 5.1	Michael Widenius	2011-05-03	1	-1/+24
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge with MySQL 5.1.57/58	Michael Widenius	2011-05-02	1	-1/+24
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| * \| \| \| \| \|	Merge with 5.1 to get in changes from MySQL 5.1.55	Michael Widenius	2011-02-28	1	-8/+31
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge with main	Michael Widenius	2011-02-22	1	-0/+3
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Fixed bug in federatedx patch that caused partition tests to fail.	Michael Widenius	2011-02-11	1	-0/+3
\| \| * \| \| \| \| \|	Merge with MySQL 5.1.55	Michael Widenius	2011-02-20	1	-8/+28
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	merge with 5.1	Michael Widenius	2010-11-30	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge with MySQL 5.1.53	Michael Widenius	2010-11-25	1	-2/+2
\| \| \|\ \ \ \ \ \
* \| \| \ \ \ \ \ \	5.5-merge	Sergei Golubchik	2011-07-02	1	-225/+255
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge from 5.1.	Guilhem Bichot	2011-05-21	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.	Guilhem Bichot	2011-05-16	1	-1/+1
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge in patch for bug 12380149	Magnus Blåudd	2011-05-06	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	merge	Mattias Jonsson	2011-01-28	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Update of copyright headers for files I changed this year.	Mattias Jonsson	2011-01-27	1	-1/+1
\| \| * \| \| \| \|	merge	Mattias Jonsson	2011-01-26	1	-0/+22
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Bug#57924: crash when creating partitioned table with	Mattias Jonsson	2011-01-10	1	-0/+22
\| * \| \| \| \| \|	Manual merge from 5.1	Mattias Jonsson	2011-01-10	1	-5/+6
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Bug#54483: valgrind errors when making warnings for	Mattias Jonsson	2010-12-22	1	-5/+6
\| \| * \| \| \| \|	Bug#54483: valgrind errors when making warnings for multiline inserts into pa...	Mattias Jonsson	2010-12-22	1	-1/+1
\| \| * \| \| \| \|	Auto-merge from mysql-5.1-bugteam.	Ramil Kalimullin	2010-11-18	1	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| * \| \| \| \|	merge	Mattias Jonsson	2010-11-15	1	-1/+20
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Bug#55091: Server crashes on ADD PARTITION after a failed attempt	Mattias Jonsson	2010-10-05	1	-1/+20
\| * \| \| \| \| \|	Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.	Davi Arnaut	2010-11-16	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure	Davi Arnaut	2010-11-10	1	-2/+2
\| \| \|/ / / /
\| * \| \| \| \|	Fix for BUG#57316 "It is not clear how to disable autocommit"	Guilhem Bichot	2010-11-05	1	-3/+2
\| * \| \| \| \|	merge	Georgi Kodinov	2010-10-27	1	-1/+2
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.	Davi Arnaut	2010-10-20	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| / / / / \| \| \|/ / / /
\| \| * \| \| \|	Bug#45288: pb2 returns a lot of compilation warnings	Davi Arnaut	2010-10-20	1	-2/+2
\| \| \|/ / /
\| * \| \| \|	Manual merge into mysql-5.5-bugteam	Mattias Jonsson	2010-10-01	1	-201/+228
\| \|\ \ \ \
\| \| * \| \| \|	Bug#56172: Server crashes in ha_partition::reset on	Mattias Jonsson	2010-10-01	1	-200/+228
\| * \| \| \| \|	Bug#50036: Inconsistent errors when using TIMESTAMP columns/expressions	Mattias Jonsson	2010-08-30	1	-8/+10
\| \|/ / / /
* \| \| \| \|	lots of post-merge changes	Sergei Golubchik	2011-04-25	1	-79/+4
* \| \| \| \|	merge.	Sergei Golubchik	2010-11-25	1	-6/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
\| * \| \|	merge with 5.1	Sergei Golubchik	2010-09-11	1	-1/+1
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge with MySQL 5.1.50	Michael Widenius	2010-08-27	1	-1/+1
\| \| \|\ \ \| \| \| \|/
\| * \| \|	Added extra argument to longlong2str() to make it have same prototype is int2...	Michael Widenius	2010-08-07	1	-1/+1
\| * \| \|	Merge with MariaDB 5.1.49	Michael Widenius	2010-08-05	1	-36/+6
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge with MySQL 5.1.49	Michael Widenius	2010-08-02	1	-36/+6
\| \| \|\ \
\| * \| \ \	merge 5.1->5.2	Sergei Golubchik	2010-06-01	1	-4/+16
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge MySQL 5.1.46 into MariaDB.	unknown	2010-04-28	1	-4/+16
\| \| \|\ \ \
\| * \| \ \ \	merged	Sergei Golubchik	2010-03-15	1	-38/+62
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	A number of after-merge fixes following merge of MySQL 5.1.44 into MariaDB.	unknown	2010-03-09	1	-2/+3