Add missing drop view


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Look for binlog in mysqlds datadir
  Update path to std-data
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Update result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Update result
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Add missing drop view
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Add missing drop view

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/extra/rpl_tests/rpl_charset.test:
  Fix merge error
mysql-test/lib/mtr_report.pm:
  Move the . out of [] to avoid log file parsing errors
mysql-test/mysql-test-run.pl:
  Correct spelling of option
sql/ha_ndbcluster_binlog.cc:
  Fix merge error(used "Use remote")

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-rpl_row_charset.test:
  Auto merged
BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
  Auto merged
CMakeLists.txt:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/suite/federated/federated.result:
  Auto merged
mysql-test/suite/federated/federated.test:
  Auto merged
mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result:
  Auto merged
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_load_from_master.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_trigger.test:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_big5.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix50117.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/trigger_notembedded.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/Makefile.am:
  SCCS merged
mysql-test/mysql-test-run.pl:
  Use local version of mtr.pl
mysql-test/lib/mtr_cases.pm:
  Use local mtr_cases.pm
mysql-test/suite/rpl/t/disabled.def:
  Use remote disabled file
mysql-test/t/disabled.def:
  Use remote disabled file
sql/ha_ndbcluster_binlog.cc:
  Use remote
mysql-test/extra/rpl_tests/rpl_charset.test:
  Manual merge
mysql-test/lib/mtr_report.pm:
  Manual merge
mysql-test/suite/binlog/r/binlog_killed_simulate.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed.test:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
  Manual merge
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
  Manual merge
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Manual merge
mysql-test/suite/ndb/r/ndb_binlog_format.result:
  Manual merge
mysql-test/suite/ndb/r/ndb_restore.result:
  Manual merge
mysql-test/suite/ndb/t/ndb_restore.test:
  Manual merge
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Manual merge
mysql-test/suite/rpl/r/rpl_stm_log.result:
  Manual merge
mysql-test/suite/rpl/t/rpl_row_sp005.test:
  Manual merge
mysql-test/t/log_state.test:
  Manual merge
mysql-test/t/mysqlbinlog.test:
  Manual merge
mysql-test/t/mysqlbinlog2.test:
  Manual merge
mysql-test/t/upgrade.test:
  Manual merge

Run "mysql --bootstrap" with verbose if turned on

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl


client/mysqltest.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  The test unnecessarily refused to run in non-debug mode. It can safely
  run in non-debug mode and produces the same result, so I removed the
  restriction.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Updated result file. It is a little unclear what the best thing to put in
  the binlog is, but the present results for this particular test are enough
  to replicate. Mats will figure out more as he fixes BUG#29020. After
  BUG#34768 has been fixed, these statements should be marked unsafe and
  not allowed in statement mode.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Updated result file. It is a little unclear what the best thing to put in
  the binlog is, but the present results for this particular test are enough
  to replicate. Mats will figure out more as he fixes BUG#29020. After
  BUG#34768 has been fixed, these statements should be marked unsafe and
  not allowed in statement mode.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


sql/handler.cc:
  Auto merged

Don't retry by default
Fixes for --embedded


mysql-test/lib/My/ConfigFactory.pm:
  Don't copy log-error to [embedded] section
mysql-test/lib/mtr_cases.pm:
  Auto skip all not_embedded when running with embedded
mysql-test/mysql-test-run.pl:
  Only uise one file for current test
  Don't retry by default
mysql-test/t/csv.test:
  Change master-data -> mysqld.1/data
mysql-test/t/innodb.test:
  Change master-data -> mysqld.1/data
mysql-test/t/ps_1general.test:
  Change master-data -> mysqld.1/data
mysql-test/t/trigger.test:
  Change master-data -> mysqld.1/data

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50


scripts/mysqlhotcopy.sh:
  Auto merged

The check_global_access() function was made available to InnoDB, but
was not defined in the embedded server library.  InnoDB, as a plugin,
is not recompiled when the embedded server is built.  This caused a
link failure when compiling applications which use the embedded server.

The fix here is to always define check_global_access() externally; in
the embedded server case, it is defined to just return OK.

Also, don't run the test case for this bug in embedded server.


mysql-test/t/innodb_bug34053.test:
  Disable this test on embedded server - it tests privilege
  checks which are not in place there.
sql/mysql_priv.h:
  Since check_global_access() may be used from some storage engine plugins
  (InnoDB, currently), and the plugins are not recompiled for the embedded
  server, it must be defined externally even for NO_EMBEDDED_ACCESS_CHECKS.
sql/sql_parse.cc:
  Since check_global_access() may be used from some storage engine plugins
  (InnoDB, currently), and the plugins are not recompiled for the embedded
  server, it must be defined externally even for NO_EMBEDDED_ACCESS_CHECKS.

into  hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean

into  hh-nb.hungers:/work/merge/mysql-5.1-build

into  hh-nb.hungers:/work/merge/mysql-5.1-bug32664

    Disable extra team trees.
    Temporary fix for entry 34761 in the bugs DB.
    (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)


mysql-test/mysql-test-run.pl:
  Disable extra team trees.
  Temporary fix for entry 34761 in the bugs DB.
  (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)

into  trift2.:/MySQL/M51/push-5.1


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0


ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
extra/yassl/src/handshake.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged

mysql-test/lib/My/ConfigFactory.pm:
  Generate [embedded] section
mysql-test/mysql-test-run.pl:
  Fix embedded server support

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl

into  alf.(none):/src/mysql-5.1-build_31929


sql/CMakeLists.txt:
  Auto merged
storage/myisam/CMakeLists.txt:
  Auto merged

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


mysql-test/suite/ndb_team/t/ndb_autodiscover.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test:
  Manual merge, use already existing way in 5.1

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

 - fix test failures that was already there but now are
   more consistent when the 1 second sleep has been removed from
   ndb_waiter


mysql-test/t/ndb_autodiscover.test:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted
mysql-test/t/ndb_autodiscover3.test:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted
mysql-test/include/ndb_wait_connected.inc:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl

mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
  Result change.

into  wva.:C:/bk/bug31745_2/mysql-5.0-build


sql/sql_parse.cc:
  Auto merged

into  wva.:C:/bk/bug31745_2/mysql-5.1-build


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/stacktrace.h:
  Auto merged
sql/stacktrace.c:
  SCCS merged

into  mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug31316-sss_server_id_clashes


sql/slave.cc:
  Auto merged

    "Server_IO_State" field

Critical error messages from get_master_version_and_clock() were written
only to the slave errorlog while Show slave status did not display any
incident happened.

Although the artifact was reported for a particular --replicate-same-server-id
related issue the fix refines all critical error reporting with 
deploying rli->report().

The test for the bug covers only --replicate-same-server-id error reporting.


mysql-test/suite/rpl/r/rpl_server_id1.result:
  new results reflecting changes
mysql-test/suite/rpl/t/rpl_server_id1.test:
  Preserving the idea of the test unnecessary queries and the sleep are
  eliminated.
  In the end the slave must stop with the error displayable via $$$.
sql/slave.cc:
  improving get_master_version_and_clock() code to report a critical incident
  via rli->report() that takes care of bothe the error log and
  the slave's status info placeholders.
  
  A critical error that force the IO slave thread to terminate is handled
  immediately (goto err).

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_sjis.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/ctype_sjis.test:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  SCCS merged
mysql-test/t/ctype_ucs.test:
  SCCS merged

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


sql/handler.cc:
  Auto merged

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl