scripts/mysql_fix_privilege_tables.sh:
  fix the message as per #16399
sql/sql_acl.cc:
  fix the priv per review comment by Serg

  Change for 'make distcheck'
libmysqld.vcproj:
  Typo


VC++Files/libmysqld/libmysqld.vcproj:
  Typo
mysql-test/ndb/Makefile.am:
  Change for 'make distcheck'
storage/archive/Makefile.am:
  Change for 'make distcheck'
plugin/fulltext/Makefile.am:
  Change for 'make distcheck'
storage/csv/Makefile.am:
  Change for 'make distcheck'
storage/heap/Makefile.am:
  Change for 'make distcheck'

    This is a re-clone after tagging, so the version must be set back to 5.1.7-beta.


configure.in:
  This is a re-clone after tagging, so the version must be set back to 5.1.7-beta.

into  april.(none):/home/svoj/devel/mysql/BUG17116/mysql-5.1-new

pushing. the code needs to be more stable.

mysql-test/t/disabled.def:
  enable ndb_dd_backuprestore

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

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

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

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

mysql-test/t/disabled.def:
  leave ndb_dd_backuprestore disabled until *.result corrected
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code was clobbered
storage/ndb/tools/restore/consumer_restore.cpp:
  surprise - ndb_restore creates events

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'