54 commits

Author	SHA1	Message	Date
Joerg Bruehe	4f22e1fc07	Fix tree setup: Wrong mailing list for commit mails.	2012-03-20 22:32:10 +01:00
Joerg Bruehe	a70c8c4b20	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	d5957d0d77	post-merge fix	2011-09-21 12:43:02 +02:00
Georgi Kodinov	0b78d56412	merge mysql-5.1-security->mysql-5.5-security	2011-08-17 13:29:09 +03:00
Georgi Kodinov	8197770c72	merge mysql-5.0-security->mysql-5.1-security	2011-08-17 13:25:33 +03:00
Georgi Kodinov	b079cea72e	changed the old @sun.com address of security trees.	2011-08-17 13:13:44 +03:00
Georgi Kodinov	82ca4276a0	fix tree name	2010-10-29 15:27:40 +03:00
Georgi Kodinov	216418e7b2	merge	2010-09-29 17:26:32 +03:00
Alexander Nozdrin	265873c7c2	Fix default.conf.	2010-08-04 13:14:09 +04:00
Alexander Nozdrin	d8f8b1cb0b	Fix default.conf.	2010-08-04 12:52:38 +04:00
Alexander Nozdrin	a342369478	Fix default.conf.	2010-08-04 12:14:25 +04:00
Georgi Kodinov	e751f33a97	merge	2010-07-21 19:08:21 +03:00
Davi Arnaut	8d407c5f70	Fix tree name.	2010-07-20 14:55:16 -03:00
Georgi Kodinov	dc62a7fc66	merge	2010-07-02 14:33:17 +03:00
Georgi Kodinov	a6bc7fed70	merge	2010-07-02 14:31:16 +03:00
Alexander Nozdrin	36348425da	Fix tree name.	2010-06-21 11:56:43 +04:00
Alexander Nozdrin	ad92ee1204	Auto-merge from mysql-trunk-bugfixing.	2010-06-10 14:38:32 +04:00
Georgi Kodinov	e085076704	changed the version back	2010-04-06 10:58:45 +03:00
Davi Arnaut	ef50dd1be4	Rename tree.	2010-03-16 21:38:13 -03:00
Georgi Kodinov	17cb596bb0	tree version change	2010-03-01 10:35:14 +02:00
Alexander Nozdrin	ed8097d050	Auto-merge from mysql-trunk.	2010-02-20 12:40:04 +03:00
Alexander Nozdrin	7b7dd8dc0a	Fix default.conf.	2010-02-20 12:26:22 +03:00
Alexander Nozdrin	4937d5e4b0	Merge from mysql-trunk.	2009-10-31 11:33:59 +03:00
Alexander Nozdrin	55a28d6ff4	Fix default.conf.	2009-10-31 11:11:10 +03:00
Georgi Kodinov	8fc8d661a1	version change	2009-10-14 18:44:22 +03:00
Alexander Nozdrin	b16e88b292	Merge from mysql-trunk.	2009-10-09 20:03:03 +04:00
Alexander Nozdrin	3dcbeb36b4	Update version in default.conf.	2009-10-09 19:54:56 +04:00
Alexander Nozdrin	0ca1292d3b	Fix default.cof.	2009-10-09 12:48:08 +04:00
Georgi Kodinov	bf1b7b7ded	version update	2009-10-06 10:32:02 +03:00
Alexander Nozdrin	668c2c1f0f	Update default.conf	2009-10-01 15:18:24 +04:00
Alexander Nozdrin	1984a19bdd	Update default.conf	2009-09-25 13:42:54 +04:00
Alexander Nozdrin	31189ee8be	Mark some tests experimental. ... Update default.conf.	2009-09-24 16:29:29 +04:00
Alexander Nozdrin	04fff1e8fe	Update default.conf.	2009-09-23 14:08:38 +04:00
Alexander Nozdrin	e4ebc5c6d9	Update default.conf.	2009-09-23 14:04:08 +04:00
Bjorn Munch	9d9ee64637	new merge from trunk	2009-09-18 16:44:11 +02:00
Alexander Nozdrin	d4e650f838	Fix default.conf	2009-09-16 14:08:43 +04:00
Alexander Nozdrin	eee9464958	Fix default.conf	2009-09-16 14:02:07 +04:00
Bjorn Munch	b5dd609a55	initial merge from 5.1-mtr	2009-09-04 15:20:58 +02:00
Georgi Kodinov	80d872bd9d	back to -bugteam	2009-09-02 19:42:46 +03:00
Alexander Nozdrin	b1252bdf96	Fix default.conf	2009-08-26 19:44:27 +04:00
Davi Arnaut	4b80599a62	Fix tree name.	2009-08-11 13:14:27 -03:00
Georgi Kodinov	46e7e31209	version change	2009-06-16 13:21:55 +03:00
Georgi Kodinov	26f88fa1d7	fixed version	2009-06-16 10:27:53 +02:00
Bjorn Munch	a24465ac27	fixed .bzr-mysql/default.conf	2009-05-29 13:10:20 +02:00
Georgi Kodinov	d4b11c0990	merge 5.0-main -> 5.1-main	2009-05-28 10:36:39 +03:00
Georgi Kodinov	ab516c5cab	changed the version	2009-05-28 10:35:29 +03:00
Georgi Kodinov	6969832813	merged addendum to bug 39920 to 5.1-bugteam	2008-12-01 17:43:51 +02:00
Davi Arnaut	04ecf17b77	Restore team tree name.	2008-09-20 03:56:33 -03:00
Davi Arnaut	7e8c13745e	Restore tree name after merge from main.	2008-09-01 17:11:42 -03:00
Chad MILLER	18e93e8fd9	Correcting tree name in bzr config. Should not include team suffix.	2008-08-15 13:55:05 -04:00