List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:January 24 2011 8:04am
Subject:bzr push into mysql-5.1-innodb branch (vasil.dimov:3687 to 3688)
View as plain text  
 3688 Vasil Dimov	2011-01-24 [merge]
      Merge mysql-5.1 -> mysql-5.1-innodb

    added:
      mysql-test/include/restart_slave_sql.inc
      mysql-test/include/rpl_connection_master.inc
      mysql-test/include/rpl_connection_slave.inc
      mysql-test/include/rpl_connection_slave1.inc
    modified:
      client/mysqladmin.cc
      client/mysqldump.c
      client/mysqlslap.c
      client/mysqltest.cc
      configure.in
      include/my_pthread.h
      include/my_sys.h
      mysql-test/Makefile.am
      mysql-test/collections/README.experimental
      mysql-test/collections/default.experimental
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/CoreDump.pm
      mysql-test/lib/My/File/Path.pm
      mysql-test/lib/My/Find.pm
      mysql-test/lib/My/Options.pm
      mysql-test/lib/My/Platform.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/Base.pm
      mysql-test/lib/My/SafeProcess/CMakeLists.txt
      mysql-test/lib/My/SafeProcess/Makefile.am
      mysql-test/lib/My/SafeProcess/safe_kill_win.cc
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      mysql-test/lib/My/SysInfo.pm
      mysql-test/lib/My/Test.pm
      mysql-test/lib/mtr_gcov.pl
      mysql-test/lib/mtr_gprof.pl
      mysql-test/lib/mtr_io.pl
      mysql-test/lib/mtr_match.pm
      mysql-test/lib/mtr_misc.pl
      mysql-test/lib/mtr_report.pm
      mysql-test/lib/mtr_stress.pl
      mysql-test/lib/mtr_unique.pm
      mysql-test/mysql-stress-test.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/client_xml.result
      mysql-test/r/ctype_many.result
      mysql-test/r/func_like.result
      mysql-test/r/func_str.result
      mysql-test/r/gis.result
      mysql-test/r/mysqladmin.result
      mysql-test/r/mysqlbinlog_row_big.result
      mysql-test/r/mysqldump.result
      mysql-test/r/mysqltest.result
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/subselect4.result
      mysql-test/r/type_datetime.result
      mysql-test/r/view_grant.result
      mysql-test/r/xml.result
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
      mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
      mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result
      mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test
      mysql-test/t/ctype_many.test
      mysql-test/t/func_like.test
      mysql-test/t/func_str.test
      mysql-test/t/gis.test
      mysql-test/t/mysqladmin.test
      mysql-test/t/mysqlbinlog_row_big.test
      mysql-test/t/mysqldump.test
      mysql-test/t/mysqltest.test
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      mysql-test/t/subselect4.test
      mysql-test/t/type_datetime.test
      mysql-test/t/view_grant.test
      mysql-test/t/xml.test
      mysql-test/valgrind.supp
      mysys/my_fopen.c
      mysys/my_getsystime.c
      sql/handler.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_func.h
      sql/item_geofunc.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.h
      sql/item_timefunc.h
      sql/log.cc
      sql/net_serv.cc
      sql/slave.cc
      sql/sql_base.cc
      sql/sql_partition.cc
      sql/sql_repl.cc
      sql/sql_select.cc
      sql/sql_string.cc
      sql/sql_string.h
      sql/sql_view.cc
      sql/table.cc
      strings/bchange.c
      strings/bcopy-duff.c
      strings/bfill.c
      strings/bmove.c
      strings/bmove512.c
      strings/bmove_upp.c
      strings/conf_to_src.c
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-extra.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-latin1.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype-utf8.c
      strings/ctype-win1250ch.c
      strings/ctype.c
      strings/decimal.c
      strings/do_ctype.c
      strings/dump_map.c
      strings/int2str.c
      strings/is_prefix.c
      strings/llstr.c
      strings/longlong2str.c
      strings/longlong2str_asm.c
      strings/memcmp.c
      strings/memcpy.c
      strings/memset.c
      strings/my_strchr.c
      strings/my_strtoll10.c
      strings/my_vsnprintf.c
      strings/r_strinstr.c
      strings/str2int.c
      strings/str_alloc.c
      strings/str_test.c
      strings/strappend.c
      strings/strcat.c
      strings/strcend.c
      strings/strchr.c
      strings/strcmp.c
      strings/strcont.c
      strings/strend.c
      strings/strfill.c
      strings/strinstr.c
      strings/strlen.c
      strings/strmake.c
      strings/strmov.c
      strings/strnlen.c
      strings/strnmov.c
      strings/strrchr.c
      strings/strstr.c
      strings/strto.c
      strings/strtod.c
      strings/strtol.c
      strings/strtoll.c
      strings/strtoul.c
      strings/strtoull.c
      strings/strxmov.c
      strings/strxnmov.c
      strings/uca-dump.c
      strings/uctypedump.c
      strings/udiv.c
      strings/utr11-dump.c
      strings/xml.c
 3687 Marko Mäkelä	2011-01-18
      Bug#59579 rw_lock_debug_print outputs to stderr
      
      rw_lock_debug_print(): Add parameter FILE* for specifying the output stream.
      rw_lock_list_print_info(): Invoke rw_lock_debug_print() on file, not stderr.

    modified:
      storage/innobase/include/sync0rw.h
      storage/innobase/sync/sync0arr.c
      storage/innobase/sync/sync0rw.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/include/sync0rw.h
      storage/innodb_plugin/sync/sync0arr.c
      storage/innodb_plugin/sync/sync0rw.c

Diff too large for email (19820 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-innodb branch (vasil.dimov:3687 to 3688) vasil.dimov24 Jan