54 commits

Author	SHA1	Message	Date
Joerg Bruehe	49de7abf1b	Fix tree setup: Wrong mailing list for commit mails.	2012-03-20 22:32:10 +01:00
Joerg Bruehe	747fbf8f8b	Merge the 5.5.22 release build into main 5.5, ... conflict in "sql/filesort.cc" solved manually.	2012-03-20 22:27:49 +01:00
Daniel Fischer	8e56eb58ec	post-merge fix	2011-09-21 12:43:02 +02:00
Georgi Kodinov	9e2109c88e	merge mysql-5.1-security->mysql-5.5-security	2011-08-17 13:29:09 +03:00
Georgi Kodinov	499be1cf1f	merge mysql-5.0-security->mysql-5.1-security	2011-08-17 13:25:33 +03:00
Georgi Kodinov	138df47b49	changed the old @sun.com address of security trees.	2011-08-17 13:13:44 +03:00
Georgi Kodinov	9d4434e393	fix tree name	2010-10-29 15:27:40 +03:00
Georgi Kodinov	6a0cfa23bd	merge	2010-09-29 17:26:32 +03:00
Alexander Nozdrin	de6b5b0a32	Fix default.conf.	2010-08-04 13:14:09 +04:00
Alexander Nozdrin	bc05a9471d	Fix default.conf.	2010-08-04 12:52:38 +04:00
Alexander Nozdrin	81906cdf38	Fix default.conf.	2010-08-04 12:14:25 +04:00
Georgi Kodinov	6b87df1f98	merge	2010-07-21 19:08:21 +03:00
Davi Arnaut	7741946342	Fix tree name.	2010-07-20 14:55:16 -03:00
Georgi Kodinov	0f5fed201f	merge	2010-07-02 14:33:17 +03:00
Georgi Kodinov	1bfb6949bc	merge	2010-07-02 14:31:16 +03:00
Alexander Nozdrin	79c88453b2	Fix tree name.	2010-06-21 11:56:43 +04:00
Alexander Nozdrin	3b3de28816	Auto-merge from mysql-trunk-bugfixing.	2010-06-10 14:38:32 +04:00
Georgi Kodinov	031d698c58	changed the version back	2010-04-06 10:58:45 +03:00
Davi Arnaut	34c6fa6db8	Rename tree.	2010-03-16 21:38:13 -03:00
Georgi Kodinov	ebaa611a49	tree version change	2010-03-01 10:35:14 +02:00
Alexander Nozdrin	ca1b669e99	Auto-merge from mysql-trunk.	2010-02-20 12:40:04 +03:00
Alexander Nozdrin	9f6662a0b4	Fix default.conf.	2010-02-20 12:26:22 +03:00
Alexander Nozdrin	31fb2d43f2	Merge from mysql-trunk.	2009-10-31 11:33:59 +03:00
Alexander Nozdrin	7ed5c11c6a	Fix default.conf.	2009-10-31 11:11:10 +03:00
Georgi Kodinov	903d21287c	version change	2009-10-14 18:44:22 +03:00
Alexander Nozdrin	1454b38b01	Merge from mysql-trunk.	2009-10-09 20:03:03 +04:00
Alexander Nozdrin	eddd727a3a	Update version in default.conf.	2009-10-09 19:54:56 +04:00
Alexander Nozdrin	f6e3ec53c7	Fix default.cof.	2009-10-09 12:48:08 +04:00
Georgi Kodinov	3d35e53c85	version update	2009-10-06 10:32:02 +03:00
Alexander Nozdrin	b9ca003a86	Update default.conf	2009-10-01 15:18:24 +04:00
Alexander Nozdrin	3baea8b9e8	Update default.conf	2009-09-25 13:42:54 +04:00
Alexander Nozdrin	45921153db	Mark some tests experimental. ... Update default.conf.	2009-09-24 16:29:29 +04:00
Alexander Nozdrin	7cd113e57c	Update default.conf.	2009-09-23 14:08:38 +04:00
Alexander Nozdrin	5a361c26cf	Update default.conf.	2009-09-23 14:04:08 +04:00
Bjorn Munch	f89b36fcbf	new merge from trunk	2009-09-18 16:44:11 +02:00
Alexander Nozdrin	b93add2065	Fix default.conf	2009-09-16 14:08:43 +04:00
Alexander Nozdrin	68fd9874b3	Fix default.conf	2009-09-16 14:02:07 +04:00
Bjorn Munch	29a142043e	initial merge from 5.1-mtr	2009-09-04 15:20:58 +02:00
Georgi Kodinov	9d82084d20	back to -bugteam	2009-09-02 19:42:46 +03:00
Alexander Nozdrin	0108660d12	Fix default.conf	2009-08-26 19:44:27 +04:00
Davi Arnaut	d33a57a694	Fix tree name.	2009-08-11 13:14:27 -03:00
Georgi Kodinov	b08120eaa7	version change	2009-06-16 13:21:55 +03:00
Georgi Kodinov	46f95f0b82	fixed version	2009-06-16 10:27:53 +02:00
Bjorn Munch	709cd00979	fixed .bzr-mysql/default.conf	2009-05-29 13:10:20 +02:00
Georgi Kodinov	67bbc74853	merge 5.0-main -> 5.1-main	2009-05-28 10:36:39 +03:00
Georgi Kodinov	4673975379	changed the version	2009-05-28 10:35:29 +03:00
Georgi Kodinov	47cff6998a	merged addendum to bug 39920 to 5.1-bugteam	2008-12-01 17:43:51 +02:00
Davi Arnaut	fa490eb933	Restore team tree name.	2008-09-20 03:56:33 -03:00
Davi Arnaut	4be706e7b9	Restore tree name after merge from main.	2008-09-01 17:11:42 -03:00
Chad MILLER	0546add33e	Correcting tree name in bzr config. Should not include team suffix.	2008-08-15 13:55:05 -04:00