List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:November 22 2011 3:45pm
Subject:bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3432 to 3433)
View as plain text  
 3433 Jon Olav Hauglid	2011-11-22 [merge]
      Merge from mysql-trunk to mysql-trunk-wl5534
      Text conflict in storage/innobase/handler/handler0alter.cc

    removed:
      storage/innobase/srv/srv0conc.c
    added:
      mysql-test/suite/rpl/r/rpl_parallel_load_data.result
      mysql-test/suite/rpl/t/rpl_parallel_load_data-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_load_data.test
      storage/innobase/include/fts0priv.ic
      storage/innobase/srv/srv0conc.cc
      storage/innobase/srv/srv0conc.cc.moved
    renamed:
      extra/innochecksum.c => extra/innochecksum.cc
      storage/innobase/btr/btr0btr.c => storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.c => storage/innobase/btr/btr0cur.cc
      storage/innobase/btr/btr0pcur.c => storage/innobase/btr/btr0pcur.cc
      storage/innobase/btr/btr0sea.c => storage/innobase/btr/btr0sea.cc
      storage/innobase/buf/buf0buddy.c => storage/innobase/buf/buf0buddy.cc
      storage/innobase/buf/buf0buf.c => storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0checksum.c => storage/innobase/buf/buf0checksum.cc
      storage/innobase/buf/buf0dump.c => storage/innobase/buf/buf0dump.cc
      storage/innobase/buf/buf0flu.c => storage/innobase/buf/buf0flu.cc
      storage/innobase/buf/buf0lru.c => storage/innobase/buf/buf0lru.cc
      storage/innobase/buf/buf0rea.c => storage/innobase/buf/buf0rea.cc
      storage/innobase/data/data0data.c => storage/innobase/data/data0data.cc
      storage/innobase/data/data0type.c => storage/innobase/data/data0type.cc
      storage/innobase/dict/dict0boot.c => storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.c => storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.c => storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.c => storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0mem.c => storage/innobase/dict/dict0mem.cc
      storage/innobase/dict/dict0stats.c => storage/innobase/dict/dict0stats.cc
      storage/innobase/dyn/dyn0dyn.c => storage/innobase/dyn/dyn0dyn.cc
      storage/innobase/eval/eval0eval.c => storage/innobase/eval/eval0eval.cc
      storage/innobase/eval/eval0proc.c => storage/innobase/eval/eval0proc.cc
      storage/innobase/fil/fil0fil.c => storage/innobase/fil/fil0fil.cc
      storage/innobase/fsp/fsp0fsp.c => storage/innobase/fsp/fsp0fsp.cc
      storage/innobase/fts/fts0ast.c => storage/innobase/fts/fts0ast.cc
      storage/innobase/fts/fts0blex.c => storage/innobase/fts/fts0blex.cc
      storage/innobase/fts/fts0config.c => storage/innobase/fts/fts0config.cc
      storage/innobase/fts/fts0fts.c => storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.c => storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0pars.c => storage/innobase/fts/fts0pars.cc
      storage/innobase/fts/fts0que.c => storage/innobase/fts/fts0que.cc
      storage/innobase/fts/fts0sql.c => storage/innobase/fts/fts0sql.cc
      storage/innobase/fts/fts0tlex.c => storage/innobase/fts/fts0tlex.cc
      storage/innobase/fut/fut0fut.c => storage/innobase/fut/fut0fut.cc
      storage/innobase/fut/fut0lst.c => storage/innobase/fut/fut0lst.cc
      storage/innobase/ha/ha0ha.c => storage/innobase/ha/ha0ha.cc
      storage/innobase/ha/ha0storage.c => storage/innobase/ha/ha0storage.cc
      storage/innobase/ha/hash0hash.c => storage/innobase/ha/hash0hash.cc
      storage/innobase/ibuf/ibuf0ibuf.c => storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/lock/lock0iter.c => storage/innobase/lock/lock0iter.cc
      storage/innobase/lock/lock0lock.c => storage/innobase/lock/lock0lock.cc
      storage/innobase/lock/lock0wait.c => storage/innobase/lock/lock0wait.cc
      storage/innobase/log/log0log.c => storage/innobase/log/log0log.cc
      storage/innobase/log/log0recv.c => storage/innobase/log/log0recv.cc
      storage/innobase/mach/mach0data.c => storage/innobase/mach/mach0data.cc
      storage/innobase/mem/mem0dbg.c => storage/innobase/mem/mem0dbg.cc
      storage/innobase/mem/mem0mem.c => storage/innobase/mem/mem0mem.cc
      storage/innobase/mem/mem0pool.c => storage/innobase/mem/mem0pool.cc
      storage/innobase/mtr/mtr0log.c => storage/innobase/mtr/mtr0log.cc
      storage/innobase/mtr/mtr0mtr.c => storage/innobase/mtr/mtr0mtr.cc
      storage/innobase/os/os0file.c => storage/innobase/os/os0file.cc
      storage/innobase/os/os0proc.c => storage/innobase/os/os0proc.cc
      storage/innobase/os/os0sync.c => storage/innobase/os/os0sync.cc
      storage/innobase/os/os0thread.c => storage/innobase/os/os0thread.cc
      storage/innobase/page/page0cur.c => storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.c => storage/innobase/page/page0page.cc
      storage/innobase/page/page0zip.c => storage/innobase/page/page0zip.cc
      storage/innobase/pars/lexyy.c => storage/innobase/pars/lexyy.cc
      storage/innobase/pars/pars0grm.c => storage/innobase/pars/pars0grm.cc
      storage/innobase/pars/pars0opt.c => storage/innobase/pars/pars0opt.cc
      storage/innobase/pars/pars0pars.c => storage/innobase/pars/pars0pars.cc
      storage/innobase/pars/pars0sym.c => storage/innobase/pars/pars0sym.cc
      storage/innobase/que/que0que.c => storage/innobase/que/que0que.cc
      storage/innobase/read/read0read.c => storage/innobase/read/read0read.cc
      storage/innobase/rem/rem0cmp.c => storage/innobase/rem/rem0cmp.cc
      storage/innobase/rem/rem0rec.c => storage/innobase/rem/rem0rec.cc
      storage/innobase/row/row0ext.c => storage/innobase/row/row0ext.cc
      storage/innobase/row/row0ftsort.c => storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0ins.c => storage/innobase/row/row0ins.cc
      storage/innobase/row/row0merge.c => storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.c => storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.c => storage/innobase/row/row0purge.cc
      storage/innobase/row/row0row.c => storage/innobase/row/row0row.cc
      storage/innobase/row/row0sel.c => storage/innobase/row/row0sel.cc
      storage/innobase/row/row0uins.c => storage/innobase/row/row0uins.cc
      storage/innobase/row/row0umod.c => storage/innobase/row/row0umod.cc
      storage/innobase/row/row0undo.c => storage/innobase/row/row0undo.cc
      storage/innobase/row/row0upd.c => storage/innobase/row/row0upd.cc
      storage/innobase/row/row0vers.c => storage/innobase/row/row0vers.cc
      storage/innobase/srv/srv0mon.c => storage/innobase/srv/srv0mon.cc
      storage/innobase/srv/srv0srv.c => storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.c => storage/innobase/srv/srv0start.cc
      storage/innobase/sync/sync0arr.c => storage/innobase/sync/sync0arr.cc
      storage/innobase/sync/sync0rw.c => storage/innobase/sync/sync0rw.cc
      storage/innobase/sync/sync0sync.c => storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0i_s.c => storage/innobase/trx/trx0i_s.cc
      storage/innobase/trx/trx0purge.c => storage/innobase/trx/trx0purge.cc
      storage/innobase/trx/trx0rec.c => storage/innobase/trx/trx0rec.cc
      storage/innobase/trx/trx0roll.c => storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0rseg.c => storage/innobase/trx/trx0rseg.cc
      storage/innobase/trx/trx0sys.c => storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.c => storage/innobase/trx/trx0trx.cc
      storage/innobase/trx/trx0undo.c => storage/innobase/trx/trx0undo.cc
      storage/innobase/usr/usr0sess.c => storage/innobase/usr/usr0sess.cc
      storage/innobase/ut/ut0bh.c => storage/innobase/ut/ut0bh.cc
      storage/innobase/ut/ut0byte.c => storage/innobase/ut/ut0byte.cc
      storage/innobase/ut/ut0crc32.c => storage/innobase/ut/ut0crc32.cc
      storage/innobase/ut/ut0dbg.c => storage/innobase/ut/ut0dbg.cc
      storage/innobase/ut/ut0list.c => storage/innobase/ut/ut0list.cc
      storage/innobase/ut/ut0mem.c => storage/innobase/ut/ut0mem.cc
      storage/innobase/ut/ut0rbt.c => storage/innobase/ut/ut0rbt.cc
      storage/innobase/ut/ut0rnd.c => storage/innobase/ut/ut0rnd.cc
      storage/innobase/ut/ut0ut.c => storage/innobase/ut/ut0ut.cc
      storage/innobase/ut/ut0vec.c => storage/innobase/ut/ut0vec.cc
      storage/innobase/ut/ut0wqueue.c => storage/innobase/ut/ut0wqueue.cc
    modified:
      extra/CMakeLists.txt
      mysql-test/include/subquery_sj.inc
      mysql-test/r/derived.result
      mysql-test/r/join.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/suite/innodb/r/innodb-ac-non-locking-select.result
      mysql-test/suite/innodb/t/innodb-ac-non-locking-select.test
      mysql-test/suite/innodb_fts/r/innodb-fts-stopword.result
      mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/parts/inc/partition_alter3.inc
      mysql-test/suite/parts/r/partition_alter3_innodb.result
      mysql-test/suite/parts/r/partition_alter3_myisam.result
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/rpl/r/rpl_parallel_ddl.result
      mysql-test/suite/rpl/t/rpl_parallel_ddl.test
      mysql-test/t/derived.test
      mysql-test/t/join.test
      sql/item.cc
      sql/log_event.cc
      sql/log_event.h
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/sql_join_cache.cc
      sql/sql_select.cc
      storage/innobase/CMakeLists.txt
      storage/innobase/fts/Makefile.query
      storage/innobase/fts/fts0pars.y
      storage/innobase/fts/make_parser.sh
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0cur.ic
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      storage/innobase/include/btr0sea.h
      storage/innobase/include/btr0sea.ic
      storage/innobase/include/btr0types.h
      storage/innobase/include/buf0buddy.h
      storage/innobase/include/buf0buddy.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0checksum.h
      storage/innobase/include/buf0dump.h
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0flu.ic
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0lru.ic
      storage/innobase/include/buf0rea.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/data0data.h
      storage/innobase/include/data0data.ic
      storage/innobase/include/data0type.h
      storage/innobase/include/data0type.ic
      storage/innobase/include/data0types.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0boot.h
      storage/innobase/include/dict0boot.ic
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0crea.ic
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0load.ic
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0mem.ic
      storage/innobase/include/dict0priv.h
      storage/innobase/include/dict0priv.ic
      storage/innobase/include/dict0stats.h
      storage/innobase/include/dict0types.h
      storage/innobase/include/dyn0dyn.h
      storage/innobase/include/dyn0dyn.ic
      storage/innobase/include/eval0eval.h
      storage/innobase/include/eval0eval.ic
      storage/innobase/include/eval0proc.h
      storage/innobase/include/eval0proc.ic
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fsp0fsp.ic
      storage/innobase/include/fsp0types.h
      storage/innobase/include/fts0fts.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/fts0types.ic
      storage/innobase/include/fut0fut.h
      storage/innobase/include/fut0fut.ic
      storage/innobase/include/fut0lst.h
      storage/innobase/include/fut0lst.ic
      storage/innobase/include/ha0ha.h
      storage/innobase/include/ha0ha.ic
      storage/innobase/include/ha0storage.h
      storage/innobase/include/ha0storage.ic
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/handler0alter.h
      storage/innobase/include/hash0hash.h
      storage/innobase/include/hash0hash.ic
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/ibuf0types.h
      storage/innobase/include/lock0iter.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/lock0lock.ic
      storage/innobase/include/lock0priv.h
      storage/innobase/include/lock0priv.ic
      storage/innobase/include/lock0types.h
      storage/innobase/include/log0log.h
      storage/innobase/include/log0log.ic
      storage/innobase/include/log0recv.h
      storage/innobase/include/log0recv.ic
      storage/innobase/include/mach0data.h
      storage/innobase/include/mach0data.ic
      storage/innobase/include/mem0dbg.h
      storage/innobase/include/mem0dbg.ic
      storage/innobase/include/mem0mem.h
      storage/innobase/include/mem0mem.ic
      storage/innobase/include/mem0pool.h
      storage/innobase/include/mem0pool.ic
      storage/innobase/include/mtr0log.h
      storage/innobase/include/mtr0log.ic
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/mtr0types.h
      storage/innobase/include/os0file.h
      storage/innobase/include/os0file.ic
      storage/innobase/include/os0proc.h
      storage/innobase/include/os0proc.ic
      storage/innobase/include/os0sync.h
      storage/innobase/include/os0sync.ic
      storage/innobase/include/os0thread.h
      storage/innobase/include/os0thread.ic
      storage/innobase/include/page0cur.h
      storage/innobase/include/page0cur.ic
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/page0zip.h
      storage/innobase/include/page0zip.ic
      storage/innobase/include/pars0grm.h
      storage/innobase/include/pars0opt.h
      storage/innobase/include/pars0opt.ic
      storage/innobase/include/pars0pars.h
      storage/innobase/include/pars0pars.ic
      storage/innobase/include/pars0sym.h
      storage/innobase/include/pars0sym.ic
      storage/innobase/include/pars0types.h
      storage/innobase/include/que0que.h
      storage/innobase/include/que0que.ic
      storage/innobase/include/que0types.h
      storage/innobase/include/read0read.h
      storage/innobase/include/read0read.ic
      storage/innobase/include/read0types.h
      storage/innobase/include/rem0cmp.h
      storage/innobase/include/rem0cmp.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/rem0types.h
      storage/innobase/include/row0ext.h
      storage/innobase/include/row0ext.ic
      storage/innobase/include/row0ins.h
      storage/innobase/include/row0ins.ic
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0mysql.ic
      storage/innobase/include/row0purge.h
      storage/innobase/include/row0purge.ic
      storage/innobase/include/row0row.h
      storage/innobase/include/row0row.ic
      storage/innobase/include/row0sel.h
      storage/innobase/include/row0sel.ic
      storage/innobase/include/row0types.h
      storage/innobase/include/row0uins.h
      storage/innobase/include/row0uins.ic
      storage/innobase/include/row0umod.h
      storage/innobase/include/row0umod.ic
      storage/innobase/include/row0undo.h
      storage/innobase/include/row0undo.ic
      storage/innobase/include/row0upd.h
      storage/innobase/include/row0upd.ic
      storage/innobase/include/row0vers.h
      storage/innobase/include/row0vers.ic
      storage/innobase/include/srv0conc.h
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0mon.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/include/srv0srv.ic
      storage/innobase/include/srv0start.h
      storage/innobase/include/sync0arr.h
      storage/innobase/include/sync0arr.ic
      storage/innobase/include/sync0rw.h
      storage/innobase/include/sync0rw.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/include/sync0sync.ic
      storage/innobase/include/sync0types.h
      storage/innobase/include/trx0i_s.h
      storage/innobase/include/trx0purge.h
      storage/innobase/include/trx0purge.ic
      storage/innobase/include/trx0rec.h
      storage/innobase/include/trx0rec.ic
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0roll.ic
      storage/innobase/include/trx0rseg.h
      storage/innobase/include/trx0rseg.ic
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0trx.ic
      storage/innobase/include/trx0types.h
      storage/innobase/include/trx0undo.h
      storage/innobase/include/trx0undo.ic
      storage/innobase/include/trx0xa.h
      storage/innobase/include/univ.i
      storage/innobase/include/usr0sess.h
      storage/innobase/include/usr0sess.ic
      storage/innobase/include/usr0types.h
      storage/innobase/include/ut0bh.h
      storage/innobase/include/ut0byte.h
      storage/innobase/include/ut0byte.ic
      storage/innobase/include/ut0crc32.h
      storage/innobase/include/ut0dbg.h
      storage/innobase/include/ut0list.h
      storage/innobase/include/ut0list.ic
      storage/innobase/include/ut0lst.h
      storage/innobase/include/ut0mem.h
      storage/innobase/include/ut0mem.ic
      storage/innobase/include/ut0rbt.h
      storage/innobase/include/ut0rnd.h
      storage/innobase/include/ut0rnd.ic
      storage/innobase/include/ut0sort.h
      storage/innobase/include/ut0ut.h
      storage/innobase/include/ut0ut.ic
      storage/innobase/include/ut0vec.h
      storage/innobase/include/ut0vec.ic
      storage/innobase/include/ut0wqueue.h
      storage/innobase/pars/make_bison.sh
      storage/innobase/pars/make_flex.sh
      storage/innobase/pars/pars0grm.y
      storage/innobase/pars/pars0lex.l
      extra/innochecksum.cc
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/btr/btr0pcur.cc
      storage/innobase/btr/btr0sea.cc
      storage/innobase/buf/buf0buddy.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0checksum.cc
      storage/innobase/buf/buf0dump.cc
      storage/innobase/buf/buf0flu.cc
      storage/innobase/buf/buf0lru.cc
      storage/innobase/buf/buf0rea.cc
      storage/innobase/data/data0data.cc
      storage/innobase/data/data0type.cc
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0mem.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/dyn/dyn0dyn.cc
      storage/innobase/eval/eval0eval.cc
      storage/innobase/eval/eval0proc.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fsp/fsp0fsp.cc
      storage/innobase/fts/fts0ast.cc
      storage/innobase/fts/fts0blex.cc
      storage/innobase/fts/fts0config.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0pars.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/fts/fts0sql.cc
      storage/innobase/fts/fts0tlex.cc
      storage/innobase/fut/fut0lst.cc
      storage/innobase/ha/ha0ha.cc
      storage/innobase/ha/ha0storage.cc
      storage/innobase/ha/hash0hash.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/lock/lock0iter.cc
      storage/innobase/lock/lock0lock.cc
      storage/innobase/lock/lock0wait.cc
      storage/innobase/log/log0log.cc
      storage/innobase/log/log0recv.cc
      storage/innobase/mach/mach0data.cc
      storage/innobase/mem/mem0dbg.cc
      storage/innobase/mem/mem0mem.cc
      storage/innobase/mem/mem0pool.cc
      storage/innobase/mtr/mtr0log.cc
      storage/innobase/mtr/mtr0mtr.cc
      storage/innobase/os/os0file.cc
      storage/innobase/os/os0proc.cc
      storage/innobase/os/os0sync.cc
      storage/innobase/os/os0thread.cc
      storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.cc
      storage/innobase/page/page0zip.cc
      storage/innobase/pars/lexyy.cc
      storage/innobase/pars/pars0grm.cc
      storage/innobase/pars/pars0opt.cc
      storage/innobase/pars/pars0pars.cc
      storage/innobase/pars/pars0sym.cc
      storage/innobase/que/que0que.cc
      storage/innobase/read/read0read.cc
      storage/innobase/rem/rem0cmp.cc
      storage/innobase/rem/rem0rec.cc
      storage/innobase/row/row0ext.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.cc
      storage/innobase/row/row0row.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0uins.cc
      storage/innobase/row/row0umod.cc
      storage/innobase/row/row0undo.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/row/row0vers.cc
      storage/innobase/srv/srv0mon.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/sync/sync0arr.cc
      storage/innobase/sync/sync0rw.cc
      storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0i_s.cc
      storage/innobase/trx/trx0purge.cc
      storage/innobase/trx/trx0rec.cc
      storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0rseg.cc
      storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.cc
      storage/innobase/trx/trx0undo.cc
      storage/innobase/usr/usr0sess.cc
      storage/innobase/ut/ut0bh.cc
      storage/innobase/ut/ut0byte.cc
      storage/innobase/ut/ut0crc32.cc
      storage/innobase/ut/ut0dbg.cc
      storage/innobase/ut/ut0list.cc
      storage/innobase/ut/ut0mem.cc
      storage/innobase/ut/ut0rbt.cc
      storage/innobase/ut/ut0rnd.cc
      storage/innobase/ut/ut0ut.cc
      storage/innobase/ut/ut0vec.cc
      storage/innobase/ut/ut0wqueue.cc
 3432 Dmitry Lenev	2011-11-22
      WL#5534 Online ALTER, Phase 1.
      
      Patch #53: Review changes.
      
      * Marked FIELD_IN_ADD_INDEX flag as deprecated and
        limited its usage only to legacy in-place ALTER API.
      * Removed separate CHANGE_CHARACTER_SET and
        SET_DEFAULT_CHARACTER_SET flags from in-place
        ALTER API.
      * Introduced new ALTER_COLUMN_EQUAL_PACK_LENGTH flag
        in order to support optimization of changing column
        types which keep packed representation compatible.

    modified:
      include/mysql_com.h
      sql/handler.cc
      sql/handler.h
      sql/sql_table.cc

Diff too large for email (31508 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3432 to 3433) Jon Olav Hauglid22 Nov