bzr push into mysql-5.1-mtr branch (bjorn.munch:2992 to 2993)

[Bjorn Munch]

 2993 Bjorn Munch	2011-03-31
      One more test suppression for rpl_extra_col_master tests

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
 2992 Bjorn Munch	2011-03-31 [merge]
      merge from 5.1 main

    removed:
      include/my_handler.h
      mysys/my_gethostbyname.c
      mysys/my_handler.c
      mysys/my_port.c
    added:
      include/my_compare.h
      mysys/my_compare.c
      win/build-vs10.bat
      win/build-vs10_x64.bat
    modified:
      .bzrignore
      client/mysqlbinlog.cc
      extra/perror.c
      include/Makefile.am
      include/heap.h
      include/my_global.h
      include/myisam.h
      libmysql/CMakeLists.txt
      libmysql/Makefile.shared
      mysql-test/extra/rpl_tests/rpl_record_compare.test
      mysql-test/r/events_bugs.result
      mysql-test/r/func_math.result
      mysql-test/r/func_time.result
      mysql-test/r/lock_sync.result
      mysql-test/r/mysqlbinlog.result
      mysql-test/r/packet.result
      mysql-test/r/shm.result
      mysql-test/r/variables-notembedded.result
      mysql-test/r/variables.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
      mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
      mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
      mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
      mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
      mysql-test/t/events_bugs.test
      mysql-test/t/func_math.test
      mysql-test/t/func_time.test
      mysql-test/t/lock_sync.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/variables-notembedded.test
      mysql-test/t/variables.test
      mysys/CMakeLists.txt
      mysys/Makefile.am
      mysys/my_net.c
      sql/field.h
      sql/handler.h
      sql/item.cc
      sql/item_func.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log_event.cc
      sql/mysqld.cc
      sql/set_var.cc
      sql/sql_base.cc
      storage/myisam/ft_stopwords.c
      storage/myisam/mi_check.c
      storage/myisam/mi_test1.c
      storage/myisam/mi_write.c
      storage/myisam/myisamdef.h
      storage/myisam/sp_test.c
=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2011-03-31 08:33:07 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2011-03-31 13:48:05 +0000
@@ -128,6 +128,7 @@ call mtr.add_suppression("Slave.*Can.t D
 call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054");
 call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072");
 call mtr.add_suppression("Slave I/O: Get master clock failed with error:.* Error_code: 2013");
+call mtr.add_suppression("Slave I/O: Get master SERVER_ID failed with error:.* Error_code: 2013");
 --enable_query_log
 
 sync_slave_with_master;

No bundle (reason: useless for push emails).