See <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/141/>
------------------------------------------ Started by upstream project "drizzle-trunk-source" build number 728 Building remotely on slicehost-lucid64 $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> Cleaning workspace... $ bzr branch lp:~drizzle-developers/ubuntu/natty/drizzle/nightly <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> Branched 1372 revision(s). $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> [drizzle-trunk-ubuntu-merge] $ bzr log -v -r revid:[email protected]:hud...@lucid64-20110111182710-fe4r9lpi7t8184uq --long --show-ids Getting local revision... $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> RevisionState revno:1372 revid:hud...@lucid64-20110111182710-fe4r9lpi7t8184uq [drizzle-trunk-ubuntu-merge] $ /bin/sh -xe /tmp/hudson1572665439095768963.sh + bzr merge lp:drizzle +N plugin/transaction_log/tests/r/bug686781.result +N plugin/transaction_log/tests/t/bug686781-master.opt +N plugin/transaction_log/tests/t/bug686781.test M drizzled/base.h M drizzled/constrained_value.h M drizzled/error.cc M drizzled/error_t.h M drizzled/message/transaction.proto M drizzled/plugin/schema_engine.cc M drizzled/plugin/storage_engine.cc M drizzled/plugin/storage_engine.h M drizzled/session.cc M drizzled/set_var.cc M drizzled/set_var.h M drizzled/sql_base.cc M drizzled/sql_insert.cc M drizzled/sql_table.cc M drizzled/sql_yacc.yy M drizzled/statement/alter_table.cc M drizzled/sys_var.cc M drizzled/sys_var.h M drizzled/table/instance.cc M drizzled/transaction_services.cc M drizzled/transaction_services.h M plugin/blitzdb/blitzindex.cc M plugin/function_engine/function.h M plugin/innobase/handler/ha_innodb.cc M plugin/memory/heap_priv.h M plugin/memory/hp_delete.cc M plugin/memory/hp_rectest.cc M plugin/memory/hp_rrnd.cc M plugin/memory/hp_rsame.cc M plugin/memory/hp_scan.cc M plugin/myisam/mi_rprev.cc M plugin/schema_engine/schema.h M plugin/tableprototester/tableprototester.cc M plugin/tableprototester/tests/r/drop_table.result M plugin/tableprototester/tests/t/drop_table.test M plugin/transaction_log/tests/r/bug660779.result M plugin/transaction_log/tests/r/bulk_commit.result M plugin/transaction_log/tests/r/bulk_rollback.result M plugin/transaction_log/tests/r/ddl_transaction_id.result M plugin/transaction_log/tests/r/information_schema.result M plugin/transaction_log/tests/r/rollback_statement.result M plugin/transaction_log/tests/r/savepoint.result M plugin/transaction_log/tests/r/transaction_log_alter.result M plugin/transaction_log/tests/r/transaction_log_create.result M plugin/transaction_log/tests/r/transaction_log_data_type.result M plugin/transaction_log/tests/r/transaction_log_delete.result M plugin/transaction_log/tests/r/transaction_log_drop.result M plugin/transaction_log/tests/r/transaction_log_large_blob.result M plugin/transaction_log/tests/r/transaction_log_loaddata.result M plugin/transaction_log/tests/r/transaction_log_replace.result M plugin/transaction_log/tests/r/transaction_log_rollback.result M plugin/transaction_log/tests/r/transaction_log_schema.result M plugin/transaction_log/tests/r/transaction_log_transaction.result M plugin/transaction_log/tests/r/transaction_log_update.result M tests/r/broken_table_proto_file.result M tests/r/create.result M tests/suite/big/r/sum_distinct-big.result M tests/suite/big/t/sum_distinct-big.test M tests/t/broken_table_proto_file.test M tests/t/create.test Text conflict in drizzled/sys_var.cc 1 conflicts encountered. _______________________________________________ Mailing list: https://launchpad.net/~drizzle-builds Post to : [email protected] Unsubscribe : https://launchpad.net/~drizzle-builds More help : https://help.launchpad.net/ListHelp
