List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:March 20 2012 9:33pm
Subject:bzr push into mysql-5.5 branch (joerg.bruehe:3763 to 3764)
View as plain text  
 3764 Joerg Bruehe	2012-03-20
      Fix tree setup: Wrong mailing list for commit mails.

    modified:
      .bzr-mysql/default.conf
 3763 Joerg Bruehe	2012-03-20 [merge]
      Merge the 5.5.22 release build into main 5.5,
      conflict in "sql/filesort.cc" solved manually.

    added:
      extra/yassl/certs/ca-key.pem
      extra/yassl/certs/client-keyEnc.pem
      extra/yassl/certs/client-keyEnc3.pem
      extra/yassl/certs/server-keyEnc.pem
      extra/yassl/taocrypt/certs/
      extra/yassl/taocrypt/certs/client-cert.der
      extra/yassl/taocrypt/certs/client-key.der
      extra/yassl/taocrypt/certs/dh1024.dat
      extra/yassl/taocrypt/certs/dsa512.der
      extra/yassl/taocrypt/include/hc128.hpp
      extra/yassl/taocrypt/include/rabbit.hpp
      extra/yassl/taocrypt/src/hc128.cpp
      extra/yassl/taocrypt/src/rabbit.cpp
      mysql-test/r/bug13633383.result
      mysql-test/suite/innodb/r/innodb_bug13510739.result
      mysql-test/suite/innodb/t/innodb_bug13510739.test
      mysql-test/t/bug13633383.test
    modified:
      .bzr-mysql/default.conf
      README
      client/mysqldump.c
      extra/yassl/INSTALL
      extra/yassl/README
      extra/yassl/certs/ca-cert.pem
      extra/yassl/certs/client-cert.der
      extra/yassl/certs/client-cert.pem
      extra/yassl/certs/client-key.der
      extra/yassl/certs/client-key.pem
      extra/yassl/certs/dsa-cert.pem
      extra/yassl/certs/dsa512.der
      extra/yassl/certs/server-cert.pem
      extra/yassl/certs/server-key.pem
      extra/yassl/certs/taoCert.txt
      extra/yassl/examples/client/client.cpp
      extra/yassl/examples/echoclient/echoclient.cpp
      extra/yassl/examples/echoserver/echoserver.cpp
      extra/yassl/examples/server/server.cpp
      extra/yassl/include/buffer.hpp
      extra/yassl/include/openssl/ssl.h
      extra/yassl/include/socket_wrapper.hpp
      extra/yassl/include/yassl_int.hpp
      extra/yassl/include/yassl_types.hpp
      extra/yassl/src/buffer.cpp
      extra/yassl/src/cert_wrapper.cpp
      extra/yassl/src/crypto_wrapper.cpp
      extra/yassl/src/handshake.cpp
      extra/yassl/src/make.bat*
      extra/yassl/src/socket_wrapper.cpp
      extra/yassl/src/ssl.cpp
      extra/yassl/src/yassl.cpp
      extra/yassl/src/yassl_error.cpp
      extra/yassl/src/yassl_imp.cpp
      extra/yassl/src/yassl_int.cpp
      extra/yassl/taocrypt/CMakeLists.txt
      extra/yassl/taocrypt/README
      extra/yassl/taocrypt/benchmark/benchmark.cpp
      extra/yassl/taocrypt/benchmark/benchmark.dsp
      extra/yassl/taocrypt/benchmark/dh1024.der
      extra/yassl/taocrypt/benchmark/dsa1024.der
      extra/yassl/taocrypt/benchmark/make.bat*
      extra/yassl/taocrypt/benchmark/rsa1024.der
      extra/yassl/taocrypt/include/asn.hpp
      extra/yassl/taocrypt/include/block.hpp
      extra/yassl/taocrypt/include/blowfish.hpp
      extra/yassl/taocrypt/include/des.hpp
      extra/yassl/taocrypt/include/file.hpp
      extra/yassl/taocrypt/include/hash.hpp
      extra/yassl/taocrypt/include/integer.hpp
      extra/yassl/taocrypt/include/kernelc.hpp
      extra/yassl/taocrypt/include/misc.hpp
      extra/yassl/taocrypt/include/modes.hpp
      extra/yassl/taocrypt/include/pwdbased.hpp
      extra/yassl/taocrypt/include/rsa.hpp
      extra/yassl/taocrypt/include/runtime.hpp
      extra/yassl/taocrypt/include/types.hpp
      extra/yassl/taocrypt/mySTL/stdexcept.hpp
      extra/yassl/taocrypt/mySTL/vector.hpp
      extra/yassl/taocrypt/src/aes.cpp
      extra/yassl/taocrypt/src/aestables.cpp
      extra/yassl/taocrypt/src/algebra.cpp
      extra/yassl/taocrypt/src/arc4.cpp
      extra/yassl/taocrypt/src/asn.cpp
      extra/yassl/taocrypt/src/blowfish.cpp
      extra/yassl/taocrypt/src/coding.cpp
      extra/yassl/taocrypt/src/dsa.cpp
      extra/yassl/taocrypt/src/hash.cpp
      extra/yassl/taocrypt/src/integer.cpp
      extra/yassl/taocrypt/src/make.bat*
      extra/yassl/taocrypt/src/md4.cpp
      extra/yassl/taocrypt/src/md5.cpp
      extra/yassl/taocrypt/src/misc.cpp
      extra/yassl/taocrypt/src/random.cpp
      extra/yassl/taocrypt/src/ripemd.cpp
      extra/yassl/taocrypt/src/rsa.cpp
      extra/yassl/taocrypt/src/sha.cpp
      extra/yassl/taocrypt/src/template_instnt.cpp
      extra/yassl/taocrypt/src/twofish.cpp
      extra/yassl/taocrypt/taocrypt.dsp
      extra/yassl/taocrypt/test/make.bat*
      extra/yassl/taocrypt/test/memory.cpp
      extra/yassl/taocrypt/test/test.cpp
      extra/yassl/testsuite/make.bat*
      extra/yassl/testsuite/test.hpp
      extra/yassl/testsuite/testsuite.cpp
      include/m_string.h
      mysql-test/r/join_outer.result
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/sp.result
      mysql-test/t/join_outer.test
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      mysql-test/t/sp-bugs.test
      mysql-test/t/sp.test
      mysql-test/valgrind.supp
      packaging/WiX/custom_ui.wxs
      sql/filesort.cc
      sql/ha_partition.cc
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_admin.cc
      sql/sql_class.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_select.cc
      sql/sql_yacc.yy
      sql/table.h
      storage/innobase/row/row0sel.c
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2012-03-20 21:27:49 +0000
+++ b/.bzr-mysql/default.conf	2012-03-20 21:32:10 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
-post_commit_to = "MYSQL_COMMITS_WW@stripped"
-post_push_to = "MYSQL_COMMITS_WW@stripped"
+post_commit_to = "commits@stripped"
+post_push_to = "commits@stripped"
 tree_name = "mysql-5.5"

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (joerg.bruehe:3763 to 3764) Joerg Bruehe21 Mar