List:Commits« Previous MessageNext Message »
From:horst.hunger Date:May 23 2012 5:56pm
Subject:bzr push into mysql-trunk-wl6218 branch (horst.hunger:3868 to 3869)
View as plain text  
 3869 horst.hunger@stripped	2012-05-23
      For gcov run.

    removed:
      mysql-test/suite/memcached/r/memc272_5_tables.result
      mysql-test/suite/memcached/t/memc272_5_tables-master.opt
      mysql-test/suite/memcached/t/memc272_5_tables.test
    added:
      mysql-test/suite/memcached/r/memc212_2_cols.result
      mysql-test/suite/memcached/r/memc213_2_intcols.result
      mysql-test/suite/memcached/r/memc214_5_cols.result
      mysql-test/suite/memcached/r/memc215_50_cols.result
      mysql-test/suite/memcached/r/memc216_5_utf8.result
      mysql-test/suite/memcached/r/memc217_add.result
      mysql-test/suite/memcached/r/memc218_decr.result
      mysql-test/suite/memcached/r/memc219_delete.result
      mysql-test/suite/memcached/r/memc220_fkey_1.result
      mysql-test/suite/memcached/r/memc221_get.result
      mysql-test/suite/memcached/r/memc222_incr.result
      mysql-test/suite/memcached/r/memc223_index_1.result
      mysql-test/suite/memcached/r/memc224_index_2.result
      mysql-test/suite/memcached/r/memc225_index_3.result
      mysql-test/suite/memcached/r/memc226_index_4.result
      mysql-test/suite/memcached/r/memc227_lock.result
      mysql-test/suite/memcached/r/memc228_mdl_1.result
      mysql-test/suite/memcached/r/memc229_mdl_2.result
      mysql-test/suite/memcached/r/memc230_mdl_3.result
      mysql-test/suite/memcached/r/memc231_mdl_4.result
      mysql-test/suite/memcached/r/memc232_NULL_cols.result
      mysql-test/suite/memcached/r/memc233_option.result
      mysql-test/suite/memcached/r/memc234_r_batch_1.result
      mysql-test/suite/memcached/r/memc235_r_batch_2.result
      mysql-test/suite/memcached/r/memc236_r_batch_3.result
      mysql-test/suite/memcached/r/memc237_sep_1.result
      mysql-test/suite/memcached/r/memc238_sep_2.result
      mysql-test/suite/memcached/r/memc239_sep_3.result
      mysql-test/suite/memcached/r/memc240_sep_4.result
      mysql-test/suite/memcached/r/memc241_replace.result
      mysql-test/suite/memcached/r/memc242_set.result
      mysql-test/suite/memcached/r/memc243_view.result
      mysql-test/suite/memcached/r/memc244_w_batch_1.result
      mysql-test/suite/memcached/r/memc245_w_batch_2.result
      mysql-test/suite/memcached/r/memc246_w_batch_3.result
      mysql-test/suite/memcached/r/memc247_cache_policy.result
      mysql-test/suite/memcached/r/memc248_fkey_2.result
      mysql-test/suite/memcached/r/memc250_container.result
      mysql-test/suite/memcached/r/memc251_w_batch_6.result
      mysql-test/suite/memcached/r/memc261_container_errs.result
      mysql-test/suite/memcached/r/memc263_r_batch_4.result
      mysql-test/suite/memcached/r/memc265_r_batch_5.result
      mysql-test/suite/memcached/r/memc266_w_batch_4.result
      mysql-test/suite/memcached/r/memc267_w_batch_5.result
      mysql-test/suite/memcached/r/memc268_w_batch_7.result
      mysql-test/suite/memcached/r/memc269_funcs_1.result
      mysql-test/suite/memcached/r/memc272_2_tables.result
      mysql-test/suite/memcached/r/memc273_5_tables.result
      mysql-test/suite/memcached/r/memc275_5_tables_index.result
      mysql-test/suite/memcached/r/memc277_default_table.result
      mysql-test/suite/memcached/r/memc278_view.result
      mysql-test/suite/memcached/r/rpl_memc270_1.result
      mysql-test/suite/memcached/r/rpl_memc271_2.result
      mysql-test/suite/memcached/t/memc212_2_cols-master.opt
      mysql-test/suite/memcached/t/memc212_2_cols.test
      mysql-test/suite/memcached/t/memc213_2_intcols-master.opt
      mysql-test/suite/memcached/t/memc213_2_intcols.test
      mysql-test/suite/memcached/t/memc214_5_cols-master.opt
      mysql-test/suite/memcached/t/memc214_5_cols.test
      mysql-test/suite/memcached/t/memc215_50_cols-master.opt
      mysql-test/suite/memcached/t/memc215_50_cols.test
      mysql-test/suite/memcached/t/memc216_5_utf8-master.opt
      mysql-test/suite/memcached/t/memc216_5_utf8.test
      mysql-test/suite/memcached/t/memc217_add-master.opt
      mysql-test/suite/memcached/t/memc217_add.test
      mysql-test/suite/memcached/t/memc218_decr-master.opt
      mysql-test/suite/memcached/t/memc218_decr.test
      mysql-test/suite/memcached/t/memc219_delete-master.opt
      mysql-test/suite/memcached/t/memc219_delete.test
      mysql-test/suite/memcached/t/memc220_fkey_1-master.opt
      mysql-test/suite/memcached/t/memc220_fkey_1.test
      mysql-test/suite/memcached/t/memc221_get-master.opt
      mysql-test/suite/memcached/t/memc221_get.test
      mysql-test/suite/memcached/t/memc222_incr-master.opt
      mysql-test/suite/memcached/t/memc222_incr.test
      mysql-test/suite/memcached/t/memc223_index_1-master.opt
      mysql-test/suite/memcached/t/memc223_index_1.test
      mysql-test/suite/memcached/t/memc224_index_2-master.opt
      mysql-test/suite/memcached/t/memc224_index_2.test
      mysql-test/suite/memcached/t/memc225_index_3-master.opt
      mysql-test/suite/memcached/t/memc225_index_3.test
      mysql-test/suite/memcached/t/memc226_index_4-master.opt
      mysql-test/suite/memcached/t/memc226_index_4.test
      mysql-test/suite/memcached/t/memc227_lock-master.opt
      mysql-test/suite/memcached/t/memc227_lock.test
      mysql-test/suite/memcached/t/memc228_mdl_1-master.opt
      mysql-test/suite/memcached/t/memc228_mdl_1.test
      mysql-test/suite/memcached/t/memc229_mdl_2-master.opt
      mysql-test/suite/memcached/t/memc229_mdl_2.test
      mysql-test/suite/memcached/t/memc230_mdl_3-master.opt
      mysql-test/suite/memcached/t/memc230_mdl_3.test
      mysql-test/suite/memcached/t/memc231_mdl_4-master.opt
      mysql-test/suite/memcached/t/memc231_mdl_4.test
      mysql-test/suite/memcached/t/memc232_NULL_cols-master.opt
      mysql-test/suite/memcached/t/memc232_NULL_cols.test
      mysql-test/suite/memcached/t/memc233_option-master.opt
      mysql-test/suite/memcached/t/memc233_option.test
      mysql-test/suite/memcached/t/memc234_r_batch_1-master.opt
      mysql-test/suite/memcached/t/memc234_r_batch_1.test
      mysql-test/suite/memcached/t/memc235_r_batch_2-master.opt
      mysql-test/suite/memcached/t/memc235_r_batch_2.test
      mysql-test/suite/memcached/t/memc236_r_batch_3-master.opt
      mysql-test/suite/memcached/t/memc236_r_batch_3.test
      mysql-test/suite/memcached/t/memc237_sep_1-master.opt
      mysql-test/suite/memcached/t/memc237_sep_1.test
      mysql-test/suite/memcached/t/memc238_sep_2-master.opt
      mysql-test/suite/memcached/t/memc238_sep_2.test
      mysql-test/suite/memcached/t/memc239_sep_3-master.opt
      mysql-test/suite/memcached/t/memc239_sep_3.test
      mysql-test/suite/memcached/t/memc240_sep_4-master.opt
      mysql-test/suite/memcached/t/memc240_sep_4.test
      mysql-test/suite/memcached/t/memc241_replace-master.opt
      mysql-test/suite/memcached/t/memc241_replace.test
      mysql-test/suite/memcached/t/memc242_set-master.opt
      mysql-test/suite/memcached/t/memc242_set.test
      mysql-test/suite/memcached/t/memc243_view-master.opt
      mysql-test/suite/memcached/t/memc243_view.test
      mysql-test/suite/memcached/t/memc244_w_batch_1-master.opt
      mysql-test/suite/memcached/t/memc244_w_batch_1.test
      mysql-test/suite/memcached/t/memc245_w_batch_2-master.opt
      mysql-test/suite/memcached/t/memc245_w_batch_2.test
      mysql-test/suite/memcached/t/memc246_w_batch_3-master.opt
      mysql-test/suite/memcached/t/memc246_w_batch_3.test
      mysql-test/suite/memcached/t/memc247_cache_policy-master.opt
      mysql-test/suite/memcached/t/memc247_cache_policy.test
      mysql-test/suite/memcached/t/memc248_fkey_2-master.opt
      mysql-test/suite/memcached/t/memc248_fkey_2.test
      mysql-test/suite/memcached/t/memc250_container-master.opt
      mysql-test/suite/memcached/t/memc250_container.test
      mysql-test/suite/memcached/t/memc251_w_batch_6-master.opt
      mysql-test/suite/memcached/t/memc251_w_batch_6.test
      mysql-test/suite/memcached/t/memc261_container_errs-master.opt
      mysql-test/suite/memcached/t/memc261_container_errs.test
      mysql-test/suite/memcached/t/memc263_r_batch_4-master.opt
      mysql-test/suite/memcached/t/memc263_r_batch_4.test
      mysql-test/suite/memcached/t/memc265_r_batch_5-master.opt
      mysql-test/suite/memcached/t/memc265_r_batch_5.test
      mysql-test/suite/memcached/t/memc266_w_batch_4-master.opt
      mysql-test/suite/memcached/t/memc266_w_batch_4.test
      mysql-test/suite/memcached/t/memc267_w_batch_5-master.opt
      mysql-test/suite/memcached/t/memc267_w_batch_5.test
      mysql-test/suite/memcached/t/memc268_w_batch_7-master.opt
      mysql-test/suite/memcached/t/memc268_w_batch_7.test
      mysql-test/suite/memcached/t/memc269_funcs_1-master.opt
      mysql-test/suite/memcached/t/memc269_funcs_1.test
      mysql-test/suite/memcached/t/memc272_2_tables-master.opt
      mysql-test/suite/memcached/t/memc272_2_tables.test
      mysql-test/suite/memcached/t/memc273_5_tables-master.opt
      mysql-test/suite/memcached/t/memc273_5_tables.test
      mysql-test/suite/memcached/t/memc275_5_tables_index-master.opt
      mysql-test/suite/memcached/t/memc275_5_tables_index.test
      mysql-test/suite/memcached/t/memc277_default_table-master.opt
      mysql-test/suite/memcached/t/memc277_default_table.test
      mysql-test/suite/memcached/t/memc278_view-master.opt
      mysql-test/suite/memcached/t/memc278_view.test
      mysql-test/suite/memcached/t/rpl_memc270_1-master.opt
      mysql-test/suite/memcached/t/rpl_memc270_1-slave.opt
      mysql-test/suite/memcached/t/rpl_memc270_1.test
      mysql-test/suite/memcached/t/rpl_memc271_2-master.opt
      mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt
      mysql-test/suite/memcached/t/rpl_memc271_2.test
    modified:
      mysql-test/suite/memcached/r/memc276_1_table.result
      mysql-test/suite/memcached/t/memc276_1_table.test
 3868 Jimmy Yang	2012-05-23
      Fix Bug #14106191 - SAME TABLE IN DIFFERENT MAPPINGS: SET IS NOT WORKING.

    modified:
      mysql-test/suite/memcached/r/memc276_1_table.result
      mysql-test/suite/memcached/t/memc276_1_table.test
      plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h
      plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
      storage/innobase/api/api0api.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/api0api.h

Diff too large for email (19616 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl6218 branch (horst.hunger:3868 to 3869) horst.hunger25 May