mysql-test/r/events.result:
  result fixed

post-review fixes


mysql-test/r/events_bugs.result:
  fix result
sql/event.cc:
  fix compilation problem on windows
sql/event_executor.cc:
  show the right host in show processlist (should be event_scheduler@localhost)
sql/event_timed.cc:
  a bit more debug infor
  fix a problem introduced with previous push :( . clean everything that's whitespace.
  found because of new test cases which were crashing.
sql/sql_show.cc:
  fix compile problem on windows

sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)


sql/event.cc:
  store the sql_mode when the body is stored
  - always on create event
  - during alter event if the user changes the body
sql/event.h:
  add sql_mode as member variable
sql/event_timed.cc:
  - exchange thd->variables.sql_mode before and after execution
  - set the sql_mode of the anonymous SP -> event_timed::sphead
sql/sql_show.cc:
  - show real content in I_S.EVENTS.SQL_MODE , disallow NULL

into lmy004.:/work/mysql-5.1-bug16406

into mysql.com:/home/psergey/mysql-5.1-look

if we've got a tree of type ALWAYS or MAYBE.


sql/opt_range.cc:
  BUG#15448 (group_min_max test failure): Don't buypass group-min-max optimizer entry point 
  if we've got a tree of type ALWAYS or MAYBE.
  The effect observed by this bug has been introduced by this cset: 
  ChangeSet 1.1967.5.2 2005/12/26 08:40:09 sergefp@mysql.com. The cset introduced PARAM::remove_jump_scans
  which purpose was to avoid making [always unsuccessful] attempts to construct index_merge for construct 
  index_merge for conditions like "t.key1partX=c1 OR t.key1partY=c2". The effect of this change was that some
  queries that previously had produced a SEL_TREE representing candidate for index_merge(X,Y) now started to 
  produce SEL_TREE with type=ALWAYS, and group-min-max analysis for these trees has been bypassed.
  In this fix we make SEL_TREE with type=ALWAYS to be processed in the same way as (SEL_TREE*)NULL, its equivalent.

into  mysql.com:/home/kostja/mysql/mysql-5.1-vanilla

into lmy004.:/work/mysql-5.1-bug16406


mysql-test/r/events.result:
  Auto merged

Fixes failing sp.test


mysql-test/r/backup.result:
  A new error message for deprecated statements.
mysql-test/t/sp.test:
  Disable warnings in the test for Bug#13012
sql/share/errmsg.txt:
  A new error message for deprecated statements.
sql/sql_yacc.yy:
  Use a better worded error message.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

mysql-test/extra/rpl_tests/rpl_row_blob.test:
  enable rpl_ndb_blob2 (sleep fixed)
mysql-test/t/disabled.def:
  enable rpl_ndb_blob2 (sleep fixed)

sql/ha_ndbcluster_binlog.cc:
  optim: setting db/schema for data events seems unnecessary
storage/ndb/src/ndbapi/Ndb.cpp:
  use NAME_LEN

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

mysql-test/t/disabled.def:
  e
  hate bk

into  mysql.com:/space/pekka/ndb/version/my51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

- test tables use blobs without PK, and was not handled correctly

storage/ndb/src/ndbapi/NdbBlob.cpp:
  DBUG
storage/ndb/include/ndbapi/Ndb.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/src/ndbapi/Ndb.cpp:
  method to set db/schema from table name + format check in internalize_table_name
sql/ha_ndbcluster_binlog.cc:
  set injector_ndb db/schema before calling NDB (may be more cases..).  only place to get it is table internal name

into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Manual merge.

fails with --vardir option.

  Fix online ordered index build of varsize table


storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Fix online ordered index build of varsize table

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

  Reintroduced a max build
  Limited testing of 'debug' and 'max' servers
  Berkeley DB only in 'max'


support-files/mysql.spec.sh:
  Reintroduced a max build
  Limited testing of 'debug' and 'max' servers
  Berkeley DB only in 'max'

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

  Added --restart-cleanup option
drop-on-restart.inc:
  DROP commands to cleanup on restart
  new file
mysqltest.c:
  Added option --include=<sql-file>


client/mysqltest.c:
  Added option --include=<sql-file>
mysql-test/include/drop-on-restart.inc:
  DROP commands to cleanup on restart
mysql-test/mysql-test-run.pl:
  Added --restart-cleanup option

client/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
client/mysqlimport.c:
  SCCS merged

We had a number of tests where there were no bugs related to disabling of tests, bugs were fixed, or no clear discription or plan.


mysql-test/t/disabled.def:
  Re-enabling tests.

into  zim.tangent.org:/home/brian/mysql/dep-5.1

Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 


client/Makefile.am:
  Added threaded libary.
client/mysqlimport.c:
  Updated logic to use threaded libmysql correctly.
client/mysqlslap.c:
  Modified how threads were working.
mysql-test/r/backup.result:
  Added deprecated messages.
sql/sql_yacc.yy:
  Added deprecated messages to RESTORE, BACKUP, and LOAD TABLE FROM MASTER

into  mysql.com:/space/pekka/ndb/version/my51

"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  compared with 5.0, this part has to move to the wrappers as the arg of --start-position depends on row-based or statement-based replication
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  result update
mysql-test/r/rpl_row_UUID.result:
  result update (somebody had forgotten to run row-based tests, the solution is to use "make test" :)
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  merge from 5.0
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  merge form 5.0
sql/mysqld.cc:
  fix after merge
sql/sp_head.cc:
  fix after merge

into  mysql.com:/home/mysql_src/mysql-5.1-new


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged

mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/t/mix_innodb_myisam_binlog.test:
  cleanup in the end

into  mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/rpl_sp-slave.opt:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/log.cc:
  auto merged
sql/mysqld.cc:
  will fix manually
sql/sp_head.cc:
  will fix manually