bzr push into mysql-5.1 branch (mats:2668 to 2669)

[Mats Kindahl]

 2669 Mats Kindahl	2008-10-06 [merge]
      Merging in 5.1-rpl

 2668 Mats Kindahl	2008-10-06 [merge]
      Merging 5.1 main into 5.1-rpl.
removed:
  extra/yassl/taocrypt/taocrypt.vcproj
  extra/yassl/yassl.vcproj
  include/mysql_h.ic
  mysql-test/suite/rpl/t/rpl_view-slave.opt
  server-tools/instance-manager/mysqlmanager.vcproj
added:
  include/mysql.h.pp
  include/mysql/plugin.h.pp
  mysql-test/r/skip_log_bin.result
  mysql-test/suite/binlog/r/binlog_grant.result
  mysql-test/suite/binlog/t/binlog_grant.test
  mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result
  mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt
  mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test
  mysql-test/t/skip_log_bin-master.opt
  mysql-test/t/skip_log_bin.test
  sql/mysql_priv.h.pp
  win/build-vs9.bat
  win/build-vs9_x64.bat
modified:
  CMakeLists.txt
  Makefile.am
  configure.in
  extra/yassl/Makefile.am
  extra/yassl/taocrypt/Makefile.am
  include/Makefile.am
  libmysql/dll.c
  mysql-test/extra/rpl_tests/rpl_ddl.test
  mysql-test/extra/rpl_tests/rpl_log.test
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/include/grant_cache.inc
  mysql-test/r/create.result
  mysql-test/r/default.result
  mysql-test/r/func_regexp.result
  mysql-test/r/grant2.result
  mysql-test/r/grant_cache_no_prot.result
  mysql-test/r/grant_cache_ps_prot.result
  mysql-test/r/status.result
  mysql-test/r/type_datetime.result
  mysql-test/r/type_set.result
  mysql-test/r/view_grant.result
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_priv_ps.result
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
  mysql-test/suite/rpl/r/rpl_row_log.result
  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
  mysql-test/t/create.test
  mysql-test/t/default.test
  mysql-test/t/func_regexp.test
  mysql-test/t/grant2.test
  mysql-test/t/partition_not_windows.test
  mysql-test/t/status.test
  mysql-test/t/type_datetime.test
  mysql-test/t/type_set.test
  mysql-test/t/view_grant.test
  scripts/mysql_install_db.sh
  sql/handler.cc
  sql/item.cc
  sql/item_cmpfunc.cc
  sql/item_cmpfunc.h
  sql/log.cc
  sql/log.h
  sql/log_event.cc
  sql/set_var.cc
  sql/set_var.h
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_derived.cc
  sql/sql_insert.cc
  sql/sql_parse.cc
  sql/sql_yacc.yy
  sql/table.cc
  sql/table.h
  zlib/zutil.h