mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
61394 commits 2784 branches 343 tags 1.6 GiB
Commit graph

47 commits

Author SHA1 Message Date
Alexander Nozdrin
fca241584f Auto-merge from mysql-next-mr. 2010-02-20 12:40:21 +03:00
Alexander Nozdrin
f027e4e00f Fix default.conf. 2010-02-20 12:27:30 +03:00
Alexander Nozdrin
9f6662a0b4 Fix default.conf. 2010-02-20 12:26:22 +03:00
Alexander Nozdrin
87c6bf3fc8 Merge from mysql-trunk-bugfixing. 2010-02-14 13:26:25 +03:00
Alexander Nozdrin
18c613a48b Fix tree name. 2010-02-12 13:13:12 +03:00
Luis Soares
c4f1de9f11 Automerge from mysql-next-mr-bugfixing. 2010-02-11 13:50:18 +00:00
Alexander Nozdrin
5cd3dffebb Update version in mysql-next-mr. 
According to new numbering scheme mysql-next-mr does not have
its own version. Some version placeholder is used instead.

It's been agreed that 5.5.99 will be used as a placeholder.
 2009-12-16 11:32:31 +03:00
Alexander Nozdrin
780871d8b9 Update version tag (new: 5.6). 2009-11-12 06:11:55 +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
Alexander Nozdrin
453eb014f7 Fix default.conf. 2009-10-27 12:44:23 +03:00
Luis Soares
f1bb8c3c55 manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 
Conflicts
=========

Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.

NOTE
====
 mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
 - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"

 This is the first cset (merge/...) committed after pulling 
 from mysql-next-mr.
 2009-10-22 23:30:28 +01:00
Alexander Nozdrin
75116feb4b Merge from mysql-trunk. 2009-10-23 00:14:05 +04:00
Alexander Nozdrin
2fc2acd7f5 Fix default.conf. 2009-10-23 00:13:18 +04: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
Alexander Nozdrin
b9ca003a86 Update default.conf 2009-10-01 15:18:24 +04:00
Luis Soares
d94e279c7c Fixed tree_name: mysql-5.1 --> mysql-5.1-rep+2 2009-09-29 00:13:56 +01: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
Bjorn Munch
d74cf92c3b null merge from trunk-mtr 2009-09-23 13:52:21 +02:00
Alexander Nozdrin
7947948c52 Update default.conf. 2009-09-23 14:12:43 +04:00
Alexander Nozdrin
8b9361663d Merge from mysql-next-mr. 2009-09-23 14:11:41 +04:00
Alexander Nozdrin
44927973c0 Merge from mysql-trunk. 2009-09-23 14:10:04 +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
36499d2101 Merge mysql-trunk-bugfixing -> mysql-next-mr-bugfixing. 2009-09-16 14:11:26 +04:00
Alexander Nozdrin
b93add2065 Fix default.conf 2009-09-16 14:08:43 +04:00
Alexander Nozdrin
c65bfe4564 Merge mysql-trunk -> mysql-next-mr. 2009-09-16 14:04:10 +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
Alexander Nozdrin
0108660d12 Fix default.conf 2009-08-26 19:44:27 +04: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
Davi Arnaut
8ed209b21d Merge and fix tree name. 2008-08-12 16:52:52 -03:00
Chad MILLER
14aef9781a Merge from 5.0. Update version. 2008-05-23 00:25:21 +02:00
Chad Miller
e981dd6215 Merge metainfo for mailer plugin. 2008-05-22 17:57:41 +02:00
Chad MILLER
636e751f36 Add branch metainfo for mailer plugin. 2008-05-21 18:18:44 -04:00