List:Commits« Previous MessageNext Message »
From:horst.hunger Date:March 2 2012 12:19pm
Subject:bzr push into mysql-trunk-wl5824 branch (horst.hunger:3837 to 3838) WL#5824
View as plain text  
 3838 horst.hunger@stripped	2012-03-02
      wl#5824: Modified the tests, so that each test has an own port like "11xxx" while xxx is the numer in the file name.Now the tests shall run in PB with parallel>=1.

    removed:
      mysql-test/suite/memcached/r/memcached_2_cols.result
      mysql-test/suite/memcached/r/memcached_2_intcols.result
      mysql-test/suite/memcached/r/memcached_50_cols.result
      mysql-test/suite/memcached/r/memcached_5_cols.result
      mysql-test/suite/memcached/r/memcached_5_utf8.result
      mysql-test/suite/memcached/r/memcached_NULL_cols.result
      mysql-test/suite/memcached/r/memcached_add.result
      mysql-test/suite/memcached/r/memcached_decr.result
      mysql-test/suite/memcached/r/memcached_delete.result
      mysql-test/suite/memcached/r/memcached_get.result
      mysql-test/suite/memcached/r/memcached_incr.result
      mysql-test/suite/memcached/r/memcached_index_1.result
      mysql-test/suite/memcached/r/memcached_index_2.result
      mysql-test/suite/memcached/r/memcached_index_3.result
      mysql-test/suite/memcached/r/memcached_index_4.result
      mysql-test/suite/memcached/r/memcached_lock.result
      mysql-test/suite/memcached/r/memcached_mdl_1.result
      mysql-test/suite/memcached/r/memcached_mdl_2.result
      mysql-test/suite/memcached/r/memcached_mdl_3.result
      mysql-test/suite/memcached/r/memcached_mdl_4.result
      mysql-test/suite/memcached/r/memcached_option.result
      mysql-test/suite/memcached/r/memcached_r_batch_1.result
      mysql-test/suite/memcached/r/memcached_r_batch_2.result
      mysql-test/suite/memcached/r/memcached_r_batch_3.result
      mysql-test/suite/memcached/r/memcached_replace.result
      mysql-test/suite/memcached/r/memcached_sep_1.result
      mysql-test/suite/memcached/r/memcached_sep_2.result
      mysql-test/suite/memcached/r/memcached_sep_3.result
      mysql-test/suite/memcached/r/memcached_sep_4.result
      mysql-test/suite/memcached/r/memcached_set.result
      mysql-test/suite/memcached/r/memcached_view.result
      mysql-test/suite/memcached/r/memcached_w_batch_1.result
      mysql-test/suite/memcached/r/memcached_w_batch_2.result
      mysql-test/suite/memcached/t/memcached_2_cols-master.opt
      mysql-test/suite/memcached/t/memcached_2_cols.test
      mysql-test/suite/memcached/t/memcached_2_intcols-master.opt
      mysql-test/suite/memcached/t/memcached_2_intcols.test
      mysql-test/suite/memcached/t/memcached_50_cols-master.opt
      mysql-test/suite/memcached/t/memcached_50_cols.test
      mysql-test/suite/memcached/t/memcached_5_cols-master.opt
      mysql-test/suite/memcached/t/memcached_5_cols.test
      mysql-test/suite/memcached/t/memcached_5_utf8-master.opt
      mysql-test/suite/memcached/t/memcached_5_utf8.test
      mysql-test/suite/memcached/t/memcached_NULL_cols-master.opt
      mysql-test/suite/memcached/t/memcached_NULL_cols.test
      mysql-test/suite/memcached/t/memcached_add-master.opt
      mysql-test/suite/memcached/t/memcached_add.test
      mysql-test/suite/memcached/t/memcached_decr-master.opt
      mysql-test/suite/memcached/t/memcached_decr.test
      mysql-test/suite/memcached/t/memcached_delete-master.opt
      mysql-test/suite/memcached/t/memcached_delete.test
      mysql-test/suite/memcached/t/memcached_get-master.opt
      mysql-test/suite/memcached/t/memcached_get.test
      mysql-test/suite/memcached/t/memcached_incr-master.opt
      mysql-test/suite/memcached/t/memcached_incr.test
      mysql-test/suite/memcached/t/memcached_index_1-master.opt
      mysql-test/suite/memcached/t/memcached_index_1.test
      mysql-test/suite/memcached/t/memcached_index_2-master.opt
      mysql-test/suite/memcached/t/memcached_index_2.test
      mysql-test/suite/memcached/t/memcached_index_3-master.opt
      mysql-test/suite/memcached/t/memcached_index_3.test
      mysql-test/suite/memcached/t/memcached_index_4-master.opt
      mysql-test/suite/memcached/t/memcached_index_4.test
      mysql-test/suite/memcached/t/memcached_lock-master.opt
      mysql-test/suite/memcached/t/memcached_lock.test
      mysql-test/suite/memcached/t/memcached_mdl_1-master.opt
      mysql-test/suite/memcached/t/memcached_mdl_1.test
      mysql-test/suite/memcached/t/memcached_mdl_2-master.opt
      mysql-test/suite/memcached/t/memcached_mdl_2.test
      mysql-test/suite/memcached/t/memcached_mdl_3-master.opt
      mysql-test/suite/memcached/t/memcached_mdl_3.test
      mysql-test/suite/memcached/t/memcached_mdl_4-master.opt
      mysql-test/suite/memcached/t/memcached_mdl_4.test
      mysql-test/suite/memcached/t/memcached_option-master.opt
      mysql-test/suite/memcached/t/memcached_option.test
      mysql-test/suite/memcached/t/memcached_r_batch_1-master.opt
      mysql-test/suite/memcached/t/memcached_r_batch_1.test
      mysql-test/suite/memcached/t/memcached_r_batch_2-master.opt
      mysql-test/suite/memcached/t/memcached_r_batch_2.test
      mysql-test/suite/memcached/t/memcached_r_batch_3-master.opt
      mysql-test/suite/memcached/t/memcached_r_batch_3.test
      mysql-test/suite/memcached/t/memcached_replace-master.opt
      mysql-test/suite/memcached/t/memcached_replace.test
      mysql-test/suite/memcached/t/memcached_sep_1-master.opt
      mysql-test/suite/memcached/t/memcached_sep_1.test
      mysql-test/suite/memcached/t/memcached_sep_2-master.opt
      mysql-test/suite/memcached/t/memcached_sep_2.test
      mysql-test/suite/memcached/t/memcached_sep_3-master.opt
      mysql-test/suite/memcached/t/memcached_sep_3.test
      mysql-test/suite/memcached/t/memcached_sep_4-master.opt
      mysql-test/suite/memcached/t/memcached_sep_4.test
      mysql-test/suite/memcached/t/memcached_set-master.opt
      mysql-test/suite/memcached/t/memcached_set.test
      mysql-test/suite/memcached/t/memcached_view-master.opt
      mysql-test/suite/memcached/t/memcached_view.test
      mysql-test/suite/memcached/t/memcached_w_batch_1-master.opt
      mysql-test/suite/memcached/t/memcached_w_batch_1.test
      mysql-test/suite/memcached/t/memcached_w_batch_2-master.opt
      mysql-test/suite/memcached/t/memcached_w_batch_2.test
      mysql-test/suite/memcached/t/memcached_w_batch_3-master.opt
      mysql-test/suite/memcached/t/memcached_w_batch_3.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/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
 3837 Jimmy Yang	2012-03-02
      Consolidate locking API for "innodb_api_disable_rowlock" configure parameter.

    modified:
      plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
      plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
      plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c

Diff too large for email (16844 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5824 branch (horst.hunger:3837 to 3838) WL#5824horst.hunger5 Mar