List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:June 29 2011 3:07pm
Subject:bzr push into mysql-5.1-mtr branch (bjorn.munch:3002 to 3003)
View as plain text  
 3003 Bjorn Munch	2011-06-29 [merge]
      merge from 5.1 main

    added:
      mysql-test/r/archive_debug.result
      mysql-test/r/implicit_char_to_num_conversion.result
      mysql-test/suite/binlog/r/binlog_reset_master.result
      mysql-test/suite/binlog/t/binlog_reset_master.test
      mysql-test/t/archive_debug.test
      mysql-test/t/implicit_char_to_num_conversion.test
    modified:
      configure.in
      extra/innochecksum.c
      extra/yassl/src/yassl_error.cpp
      include/m_string.h
      include/my_getopt.h
      libmysqld/lib_sql.cc
      mysql-test/collections/default.experimental
      mysql-test/r/alter_table.result
      mysql-test/r/events_bugs.result
      mysql-test/r/func_math.result
      mysql-test/r/func_time.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/partition.result
      mysql-test/r/sp_sync.result
      mysql-test/r/trigger-compat.result
      mysql-test/r/trigger.result
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/federated/disabled.def
      mysql-test/suite/funcs_1/t/disabled.def
      mysql-test/suite/funcs_2/t/disabled.def
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb_plugin/r/innodb_mysql.result
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb_team/t/disabled.def
      mysql-test/suite/parts/t/disabled.def
      mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_relayspace.test
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/t/alter_table.test
      mysql-test/t/disabled.def
      mysql-test/t/events_bugs.test
      mysql-test/t/func_math.test
      mysql-test/t/func_time.test
      mysql-test/t/gis-rtree.test
      mysql-test/t/partition.test
      mysql-test/t/sp_sync.test
      mysql-test/t/trigger-compat.test
      sql/derror.cc
      sql/event_db_repository.cc
      sql/event_db_repository.h
      sql/event_parse_data.cc
      sql/event_parse_data.h
      sql/events.cc
      sql/field.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/item_create.cc
      sql/item_func.cc
      sql/item_strfunc.cc
      sql/item_timefunc.cc
      sql/log.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/password.c
      sql/sp.cc
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_db.cc
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_yacc.yy
      sql/table.cc
      sql/unireg.cc
      storage/archive/azio.c
      storage/archive/ha_archive.cc
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/dict/dict0load.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0types.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/univ.i
      storage/innobase/page/page0page.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0upd.c
      storage/innobase/row/row0vers.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0rec.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/buf/buf0buddy.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/include/btr0btr.h
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/btr0cur.ic
      storage/innodb_plugin/include/buf0buddy.h
      storage/innodb_plugin/include/buf0buddy.ic
      storage/innodb_plugin/include/buf0buf.h
      storage/innodb_plugin/include/buf0buf.ic
      storage/innodb_plugin/include/buf0lru.h
      storage/innodb_plugin/include/buf0types.h
      storage/innodb_plugin/include/page0cur.ic
      storage/innodb_plugin/include/page0page.h
      storage/innodb_plugin/include/page0page.ic
      storage/innodb_plugin/include/rem0rec.h
      storage/innodb_plugin/include/rem0rec.ic
      storage/innodb_plugin/include/row0row.h
      storage/innodb_plugin/include/row0row.ic
      storage/innodb_plugin/include/row0upd.ic
      storage/innodb_plugin/include/sync0rw.ic
      storage/innodb_plugin/include/sync0sync.h
      storage/innodb_plugin/include/trx0sys.h
      storage/innodb_plugin/include/trx0sys.ic
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/page/page0cur.c
      storage/innodb_plugin/page/page0page.c
      storage/innodb_plugin/page/page0zip.c
      storage/innodb_plugin/rem/rem0rec.c
      storage/innodb_plugin/row/row0ins.c
      storage/innodb_plugin/row/row0row.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/row/row0vers.c
      storage/innodb_plugin/sync/sync0rw.c
      storage/innodb_plugin/sync/sync0sync.c
      storage/innodb_plugin/trx/trx0rec.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/myisam/mi_update.c
      storage/myisam/mi_write.c
 3002 Bjorn Munch	2011-05-12 [merge]
      merge from 5.1 main

    added:
      mysql-test/suite/innodb/r/innodb_bug59410.result
      mysql-test/suite/innodb/r/innodb_bug59641.result
      mysql-test/suite/innodb/t/innodb_bug59410.test
      mysql-test/suite/innodb/t/innodb_bug59641.test
      mysql-test/suite/innodb_plugin/r/innodb_bug59410.result
      mysql-test/suite/innodb_plugin/r/innodb_bug59641.result
      mysql-test/suite/innodb_plugin/t/innodb_bug59410.test
      mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
    modified:
      client/Makefile.am
      client/mysqlbinlog.cc
      client/mysqltest.cc
      cmd-line-utils/libedit/el.c
      configure.in
      extra/replace.c
      mysql-test/include/wait_until_disconnected.inc
      mysql-test/r/archive.result
      mysql-test/r/cast.result
      mysql-test/r/events_1.result
      mysql-test/r/events_restart.result
      mysql-test/r/gis.result
      mysql-test/r/mysqlbinlog_base64.result
      mysql-test/r/type_newdecimal.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/t/archive.test
      mysql-test/t/cast.test
      mysql-test/t/events_1.test
      mysql-test/t/events_restart.test
      mysql-test/t/gis.test
      mysql-test/t/mysqlbinlog_base64.test
      mysql-test/t/type_newdecimal.test
      scripts/make_win_bin_dist
      sql/event_db_repository.cc
      sql/field.cc
      sql/ha_partition.cc
      sql/handler.h
      sql/item_timefunc.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/slave.cc
      sql/sql_class.cc
      sql/sql_connect.cc
      sql/sql_table.cc
      storage/archive/ha_archive.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/trx0trx.h
      storage/innobase/log/log0log.c
      storage/innobase/trx/trx0trx.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/ha_innodb.h
      storage/innodb_plugin/handler/handler0alter.cc
      storage/innodb_plugin/include/trx0trx.h
      storage/innodb_plugin/include/trx0undo.h
      storage/innodb_plugin/log/log0log.c
      storage/innodb_plugin/trx/trx0sys.c
      storage/innodb_plugin/trx/trx0trx.c
      storage/innodb_plugin/trx/trx0undo.c
      storage/ndb/src/kernel/blocks/lgman.cpp
      strings/decimal.c
      vio/viosocket.c

Diff too large for email (10089 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-mtr branch (bjorn.munch:3002 to 3003) Bjorn Munch29 Jun