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

	Commit message (Expand)	Author	Age	Files	Lines
*	Manual merge.	Davi Arnaut	2009-09-30	1	-1/+1
\|\
\| *	Bug#47525: MySQL crashed (Federated)	Davi Arnaut	2009-09-30	1	-1/+1
* \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-09-23	1	-7/+7
* \|	A patch for Bug#47474 (mysqld hits Dbug_violation_helper assert	Alexander Nozdrin	2009-09-23	1	-3/+6
* \|	Bug #42914 Log event that larger than max_allowed_packet results in stop of s...	unknown	2009-09-18	1	-4/+8
* \|	auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam	Alfranio Correia	2009-08-24	1	-3/+0
\|\ \
\| * \|	BUG#45694 Deadlock in replicated statement is not retried	Alfranio Correia	2009-08-19	1	-3/+0
* \| \|	Merge from mysql-5.0-bugteam.	Davi Arnaut	2009-08-13	1	-0/+25
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Bug#46013: rpl_extraColmaster_myisam fails on pb2	Davi Arnaut	2009-08-13	1	-0/+25
* \|	Merge from 5.0	Gleb Shchepa	2009-07-24	1	-13/+8
\|\ \ \| \|/
\| *	Bug #38816: kill + flush tables with read lock + stored	Gleb Shchepa	2009-07-24	1	-14/+6
\| *	Merge from 5.0-bt	Staale Smedseng	2009-06-29	1	-3/+3
* \|	Bug #45214 get_master_version_and_clock does not report error when queries fail	unknown	2009-07-17	1	-1/+0
* \|	Bug #45214 get_master_version_and_clock does not report error when queries fail	unknown	2009-07-16	1	-32/+166
* \|	BUG#44581 Slave stops when transaction with non-transactional table gets lock...	Alfranio Correia	2009-07-06	1	-19/+0
* \|	local merge: 5.1-bt bug branch --> 5.1-bt latest	Luis Soares	2009-06-26	1	-0/+3
\|\ \
\| * \|	BUG#44270: RESET SLAVE does not reset Last_IO_Error or Last_IO_Errno	Luis Soares	2009-06-03	1	-0/+3
* \| \|	Bug #38240 Crash in safe_mutex_lock () thr_mutex.c line 97 on rotate_relay_log	Andrei Elkin	2009-06-23	1	-3/+20
* \| \|	BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind	Alfranio Correia	2009-06-16	1	-0/+4
\| \| \|
\| \ \
*-. \ \	Merge from 5.0-bugteam for 43414	Staale Smedseng	2009-06-09	1	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/
\| \| *	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-09	1	-1/+1
\| * \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-09	1	-1/+2
\| \|/
* \|	BUG#41725: upmerge: 5.0-bt --> 5.1-bt	Luis Soares	2009-05-23	1	-0/+9
\|\ \ \| \|/
\| *	BUG#41725: slave crashes when inserting into temporary table after	Luis Soares	2009-05-23	1	-0/+10
\| *	Merge community up to enterprise, thus ending the community-server	Chad MILLER	2009-05-06	1	-20/+20
\| \|\
\| \| *	Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.clone-5.0.81-build	Chad MILLER	2009-04-14	1	-7/+7
\| \| \|\
\| \| * \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-30/+73
\| \| \|\ \
\| \| * \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-7/+11
\| \| \|\ \ \
\| \| * \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2007-12-10	1	-20/+20
\| \| \|\ \ \ \
\| \| \| * \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2007-09-10	1	-20/+20
\| \| \| \|\ \ \ \
\| \| \| \| * \ \ \	Merge mysqldev@production.mysql.com:my/mysql-5.0-release	unknown	2007-07-02	1	-20/+20
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \ \ \	Merge mysqldev@production.mysql.com:my/mysql-5.0-release	unknown	2007-04-26	1	-20/+20
\| \| \| \| \| \|\ \ \ \
* \| \| \| \| \| \ \ \ \	auto-merge 5.1-bugteam (local) --> 5.1-bugteam	Alfranio Correia	2009-05-21	1	-2/+9
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	BUG#43949 Initialization of slave produces a warning message in Valgrind	Alfranio Correia	2009-04-19	1	-2/+9
* \| \| \| \| \| \| \| \| \| \|	Merge main 5.1 into 5.1-build	Joerg Bruehe	2009-05-08	1	-24/+67
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused variable.	Davi Arnaut	2009-05-05	1	-2/+0
\| * \| \| \| \| \| \| \| \| \| \|	merging 5.0-bt to 5.1-bt	Andrei Elkin	2009-04-30	1	-20/+39
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	merging from 5.0-bt rep to a local branch	Andrei Elkin	2009-04-30	1	-2/+1
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	merging	Alexey Botchkov	2009-04-28	1	-2/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \|	Bug#25058 ignored return codes in memory allocation functions	Alexey Botchkov	2008-11-21	1	-2/+1
\| \| * \| \| \| \| \| \| \| \| \| \|	Bug #38694 Race condition in replication thread shutdown	Andrei Elkin	2009-04-28	1	-26/+79
\| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	Bug#29125 Windows Server X64: so many compiler warnings	Ignacio Galarza	2009-02-10	1	-7/+7
\| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	Merge amd64.(none):/src/mysql-5.0-bugteam	unknown	2008-03-28	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Bug#26243 mysql command line crash after control-c	unknown	2008-03-28	1	-1/+1
\| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge stella.local:/home2/mydev/mysql-5.0-amain	unknown	2008-03-26	1	-24/+44
\| \| \|\ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \	merge bug#38205 fixes to 5.1-bt	Andrei Elkin	2009-04-21	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Bug#38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUP	Andrei Elkin	2009-03-26	1	-0/+3
\| * \| \| \| \| \| \| \| \| \|	auto-merge	Tatiana A. Nurnberg	2009-04-14	1	-6/+18
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	merge 5.1-bugteam --> 5.1-bugteam (local)	Alfranio Correia	2009-04-08	1	-0/+1
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	BUG#39393 slave-skip-errors does not work when using ROW based replication	Alfranio Correia	2009-04-05	1	-0/+1
\| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|