Commit graph

34 commits

Author SHA1 Message Date
Alexander Nozdrin
1d963ad47c Merge from mysql-next-mr. 2009-10-09 20:06:35 +04:00
Alexander Nozdrin
84f90701d9 Merge from mysql-trunk. 2009-10-09 19:56:30 +04:00
Alexander Nozdrin
3dcbeb36b4 Update version in default.conf. 2009-10-09 19:54:56 +04:00
Alexander Nozdrin
256a3b3795 Merge from mysql-next-mr. 2009-10-09 13:00:36 +04:00
Alexander Nozdrin
0ca1292d3b Fix default.cof. 2009-10-09 12:48:08 +04:00
Alexander Nozdrin
668c2c1f0f Update default.conf 2009-10-01 15:18:24 +04:00
Alexander Nozdrin
3a5c4ab4b2 Update default.conf. 2009-09-28 00:54:22 +04:00
Alexander Nozdrin
23e8e0a1c1 Merge from mysql-next-mr. 2009-09-25 18:58:53 +04:00
Alexander Nozdrin
b21cd91780 Merge from mysql-trunk (update default.conf). 2009-09-25 13:47:58 +04:00
Alexander Nozdrin
1984a19bdd Update default.conf 2009-09-25 13:42:54 +04:00
Alexander Nozdrin
19a223fee4 Merge from mysql-trunk-alik (stabilizing changes). 2009-09-24 16:40:09 +04:00
Alexander Nozdrin
31189ee8be Mark some tests experimental.
Update default.conf.
2009-09-24 16:29:29 +04:00
Alexander Nozdrin
2ff2b14477 Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr). 2009-09-23 17:57:39 +04:00
Alexander Nozdrin
8dd75c98ed Update default.conf. 2009-09-23 14:12:43 +04:00
Alexander Nozdrin
9b9f814d63 Merge from mysql-next-mr. 2009-09-23 14:11:41 +04:00
Alexander Nozdrin
1bb4ba29be Merge from mysql-trunk. 2009-09-23 14:10:04 +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
Marc Alff
c69818ff79 fixed tree name 2009-09-17 03:23:05 -06:00
Alexander Nozdrin
fc1957083d Merge mysql-trunk-bugfixing -> mysql-next-mr-bugfixing. 2009-09-16 14:11:26 +04:00
Alexander Nozdrin
d4e650f838 Fix default.conf 2009-09-16 14:08:43 +04:00
Alexander Nozdrin
4b4fcdd8f0 Merge mysql-trunk -> mysql-next-mr. 2009-09-16 14:04:10 +04:00
Alexander Nozdrin
eee9464958 Fix default.conf 2009-09-16 14:02:07 +04:00
Alexander Nozdrin
b1252bdf96 Fix default.conf 2009-08-26 19:44:27 +04: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
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
Davi Arnaut
084a2c94f4 Merge and fix tree name. 2008-08-12 16:52:52 -03:00
Chad MILLER
4215c0d625 Merge from 5.0. Update version. 2008-05-23 00:25:21 +02:00
Chad Miller
8e15e3da89 Merge metainfo for mailer plugin. 2008-05-22 17:57:41 +02:00
Chad MILLER
7648ea9e08 Add branch metainfo for mailer plugin. 2008-05-21 18:18:44 -04:00