From: Bjorn Munch Date: January 10 2011 11:11am Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:3001 to 3003) List-Archive: http://lists.mysql.com/commits/128264 Message-Id: <201101101111.p0ABBOjg011446@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3003 Bjorn Munch 2011-01-10 [merge] null upmerge 3002 Bjorn Munch 2011-01-10 [merge] merge from trunk removed: include/my_no_pthread.h mysys/mf_brkhant.c added: mysql-test/r/filesort_debug.result mysql-test/t/filesort_debug.test renamed: mysql-test/suite/funcs_1/r/myisam_views.result => mysql-test/suite/funcs_1/r/myisam_views-big.result mysql-test/suite/funcs_1/t/myisam_views.test => mysql-test/suite/funcs_1/t/myisam_views-big.test modified: client/mysqladmin.cc cmd-line-utils/readline/CMakeLists.txt config.h.cmake dbug/dbug.c dbug/dbug_analyze.c dbug/my_main.c dbug/tests.c include/CMakeLists.txt include/heap.h include/my_base.h include/my_bitmap.h include/my_global.h include/my_pthread.h include/my_sys.h include/myisam.h include/thr_alarm.h libmysql/client_settings.h libmysql/libmysql.c mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/collections/mysql-trunk.weekly mysql-test/include/icp_tests.inc mysql-test/r/auto_increment.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_none.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_none.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/not_embedded_server.result mysql-test/r/order_by_all.result mysql-test/r/select_all.result mysql-test/r/select_all_jcl6.result mysql-test/r/select_icp_mrr_jcl6.result mysql-test/r/select_none_jcl6.result mysql-test/r/show_check.result mysql-test/suite/engines/funcs/r/db_alter_character_set.result mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_error.result mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_ignore.result mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_error.result mysql-test/suite/engines/funcs/r/in_string_pk_constraint_error.result mysql-test/suite/engines/funcs/r/in_string_unique_constraint_error.result mysql-test/suite/engines/funcs/r/rpl000013.result mysql-test/suite/engines/funcs/r/rpl_000015.result mysql-test/suite/engines/funcs/r/rpl_change_master.result mysql-test/suite/engines/funcs/r/rpl_drop.result mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result mysql-test/suite/engines/funcs/r/rpl_log_pos.result mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result mysql-test/suite/engines/funcs/r/rpl_row_drop.result mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result mysql-test/suite/engines/funcs/r/rpl_row_sp005.result mysql-test/suite/engines/funcs/r/rpl_row_trig003.result mysql-test/suite/engines/funcs/r/rpl_row_until.result mysql-test/suite/engines/funcs/r/rpl_server_id1.result mysql-test/suite/engines/funcs/r/rpl_server_id2.result mysql-test/suite/engines/funcs/r/rpl_session_var.result mysql-test/suite/engines/funcs/r/rpl_slave_status.result mysql-test/suite/engines/funcs/r/rpl_stm_no_op.result mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result mysql-test/suite/engines/funcs/r/rpl_temp_table.result mysql-test/suite/engines/funcs/r/rpl_trigger.result mysql-test/suite/engines/funcs/r/se_join_left.result mysql-test/suite/engines/funcs/r/se_join_left_outer.result mysql-test/suite/engines/funcs/r/se_join_natural_left.result mysql-test/suite/engines/funcs/r/se_join_natural_left_outer.result mysql-test/suite/engines/funcs/r/sf_alter.result mysql-test/suite/engines/funcs/r/sf_cursor.result mysql-test/suite/engines/funcs/r/sp_alter.result mysql-test/suite/engines/funcs/r/sp_cursor.result mysql-test/suite/engines/funcs/r/ta_rename.result mysql-test/suite/engines/funcs/t/db_alter_collate_utf8.test mysql-test/suite/engines/funcs/t/disabled.def mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_error.test mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_ignore.test mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_error.test mysql-test/suite/engines/funcs/t/in_string_pk_constraint_error.test mysql-test/suite/engines/funcs/t/in_string_unique_constraint_error.test mysql-test/suite/engines/funcs/t/rpl000013.test mysql-test/suite/engines/funcs/t/rpl_000015.test mysql-test/suite/engines/funcs/t/rpl_change_master.test mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable.test mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test mysql-test/suite/engines/funcs/t/rpl_get_lock.test mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test mysql-test/suite/engines/funcs/t/rpl_loadfile.test mysql-test/suite/engines/funcs/t/rpl_log_pos.test mysql-test/suite/engines/funcs/t/rpl_misc_functions.test mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test mysql-test/suite/engines/funcs/t/rpl_row_drop.test mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test mysql-test/suite/engines/funcs/t/rpl_row_until.test mysql-test/suite/engines/funcs/t/rpl_server_id1.test mysql-test/suite/engines/funcs/t/rpl_server_id2.test mysql-test/suite/engines/funcs/t/rpl_slave_status.test mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test mysql-test/suite/engines/funcs/t/rpl_temp_table.test mysql-test/suite/engines/funcs/t/rpl_temporary.test mysql-test/suite/engines/funcs/t/rpl_trigger.test mysql-test/suite/engines/funcs/t/se_join_left.test mysql-test/suite/engines/funcs/t/se_join_left_outer.test mysql-test/suite/engines/funcs/t/se_join_natural_left.test mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test mysql-test/suite/engines/iuds/r/insert_number.result mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result mysql-test/suite/engines/iuds/r/strings_update_delete.result mysql-test/suite/engines/iuds/r/type_bit_iuds.result mysql-test/suite/engines/iuds/r/update_delete_calendar.result mysql-test/suite/engines/iuds/r/update_delete_number.result mysql-test/suite/engines/iuds/t/disabled.def mysql-test/suite/engines/iuds/t/insert_number.test mysql-test/suite/engines/iuds/t/update_delete_calendar.test mysql-test/suite/innodb/r/innodb-timeout.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/t/innodb-timeout.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/perfschema/include/binlog_common.inc mysql-test/suite/perfschema/r/binlog_mix.result mysql-test/suite/perfschema/r/binlog_row.result mysql-test/suite/perfschema/r/binlog_stmt.result mysql-test/suite/perfschema/t/binlog_mix.test mysql-test/suite/perfschema/t/binlog_row.test mysql-test/suite/perfschema/t/binlog_stmt.test mysql-test/t/auto_increment.test mysql-test/t/not_embedded_server.test mysql-test/t/show_check.test mysys/mf_iocache.c mysys/mf_iocache2.c mysys/mf_keycache.c mysys/mf_keycaches.c mysys/my_bitmap.c mysys/my_fopen.c mysys/my_fstream.c mysys/my_gethostbyname.c mysys/my_init.c mysys/my_lib.c mysys/my_open.c mysys/my_pread.c mysys/my_pthread.c mysys/my_read.c mysys/my_static.c mysys/my_thr_init.c mysys/my_write.c mysys/mysys_priv.h mysys/thr_alarm.c mysys/thr_lock.c mysys/thr_mutex.c mysys/thr_rwlock.c sql-common/client.c sql-common/client_plugin.c sql/bounded_queue.h sql/client_settings.h sql/filesort.cc sql/ha_partition.cc sql/handler.h sql/item.h sql/log.cc sql/sql_show.cc storage/heap/heapdef.h storage/heap/hp_block.c storage/heap/hp_create.c storage/heap/hp_open.c storage/heap/hp_static.c storage/heap/hp_test2.c storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buf.c storage/innobase/dict/dict0dict.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/include/btr0cur.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/row0upd.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0rw.h storage/innobase/include/trx0i_s.h storage/innobase/include/trx0purge.h storage/innobase/include/univ.i storage/innobase/log/log0recv.c storage/innobase/row/row0mysql.c storage/innobase/row/row0purge.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0purge.c storage/innobase/ut/ut0dbg.c storage/myisam/ha_myisam.cc storage/myisam/mi_check.c storage/myisam/mi_close.c storage/myisam/mi_delete.c storage/myisam/mi_delete_all.c storage/myisam/mi_dynrec.c storage/myisam/mi_log.c storage/myisam/mi_open.c storage/myisam/mi_static.c storage/myisam/mi_statrec.c storage/myisam/mi_update.c storage/myisam/mi_write.c storage/myisam/myisamdef.h storage/myisam/sort.c storage/myisammrg/myrg_def.h tests/thread_test.c mysql-test/suite/funcs_1/t/myisam_views-big.test 3001 Bjorn Munch 2010-12-29 [merge] null upmerge Diff too large for email (40161 lines, the limit is 10000). No bundle (reason: useless for push emails).