into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged

  expand tab


client/mysqltest.c:
  expand tab

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged

  Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.


client/mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
mysql-test/r/mysqltest.result:
  Update test result for real_sleep error message.
mysql-test/README:
  Fix URL.
mysql-test/mysql-test-run.sh:
  Fix URLs.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged

  Fix reference to incorrect (non-existent) options in comment.


client/mysqltest.c:
  Fix reference to incorrect (non-existent) options in comment.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged

  Correct/clarify comments.


client/mysqltest.c:
  Correct/clarify comments.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged

  Fix typos.


client/mysqltest.c:
  Fix typos.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  y
  manual merge

  Fix typos.


client/mysqltest.c:
  Fix typos.

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

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

(forgotten to be committed)

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/ndberror.c:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.

mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
  Updated from review comments
mysql-test/include/rpl_multi_engine3.inc:
  Updated from review comments

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

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

(post-review pre-push changes)
coding style (mostly trailing spaces removed)


mysql-test/r/events.result:
  fix result file
sql/event.cc:
  - remove trailing spaces
  - add a missing initializer (gcc warning)
  - C++ to C comments
sql/event_executor.cc:
  - fix coding style (C++ to C comments, remove trailing spaces)
  - fix wrong indexing buggie not found till now (queue indexing is 0 based,
    not 1 based)
sql/event_timed.cc:
  - fix coding style

into  mysql.com:/usr/home/bar/mysql-5.1-new.16313

- moved used_partitions initialization

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

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

VC++Files/sql/mysqld.vcproj:
  Add missing source file.

win/cmakefiles/mysys:
  Remove no longer existing source file from list.
sql/log_event.cc:
  Fix byte * <-> char * Windows build problem.
VC++Files/mysys/mysys.vcproj:
  Remove no longer existing source file from list.

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


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

- code wrongly tries to do a "fast alter partition", although not supported


sql/handler.h:
  moved defines
sql/sql_partition.h:
  moved defines

- too little space was allocated for receiving events, partition uses extra column in table


mysql-test/r/ndb_partition_range.result:
  Bug#16385, Partitions: crash when updating a range partitioned NDB table
mysql-test/t/ndb_partition_range.test:
  Bug#16385, Partitions: crash when updating a range partitioned NDB table

- error string wrongly formatted


mysql-test/r/ndb_partition_error.result:
  Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/t/ndb_partition_error.test:
  Bug #17763 mysqld cores with list partitioning if update to missing partition

mysql-test/r/events.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

- now when the event is created and STARTS is omitted then STARTS is implicitly
  CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)


mysql-test/r/events.result:
  results of new test cases
mysql-test/t/events.test:
  new test cases for bug #16537 (Events: mysql.event.starts is null)
sql/event.cc:
  - check whether event_timed::starts_null only in case
    event_timed::expression is set, so for recurring events only
  - disable binlogging of CREATE EVENT statement. It should not be
    replicated but the result of the execution. Still the replication is
    untouched topic.
sql/event.h:
  - add flags whether starts, ends and execute_at are null or not
sql/event_executor.cc:
  - check whether xxx_null instead of !xxxx.year
sql/event_timed.cc:
  - introduce xxx_null and change the usage of xxx.year to !xxx_null
sql/sql_show.cc:
  - don't show 0000-00-00 in I_S.EVENTS when the value is NULL
sql/sql_yacc.yy:
  - if STARTS is omitted default to current_timestamp

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that the "!" character written at the end was ignored.

  Now if we try to scan "!=", and if "!" is not
  followed by "=", we rollback lex scanner back 
  to "!" token, so the parser will start to check
  the next rule from the "!" character again.

  Previously parser started from the next character,
  which was EOF in the example in xml.test,
  which led to query being successfully parsed,
  instead of producing a syntax error.


sql/item_xmlfunc.cc:
  Bug#16313 XML: extractvalue() ignores '!' in names
  '!' at the end was ignored.
  Now if we try to scan "!=", and if "!" is not
  followed by "=", we rollback lex scanner back 
  to "!" token, so the parser will start to check
  the next rule from the "!" character again.
  Previously it started from the next character,
  which was EOF in the example in xml.test, and
  which led to query being successfully parsed,
  instead of producing a syntax error.
mysql-test/t/xml.test:
  Adding test case.
mysql-test/r/xml.result:
  Adding test case.

sql/sql_class.cc:
  fixed code caused superfluous protocol->remove_last_row() call

into  zim.(none):/home/brian/mysql/dep-5.1

mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Fixing isssues with preexisting tables
mysql-test/r/binlog_stm_insert_select.result:
  new results

into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


mysql-test/t/trigger.test:
  Auto merged

bug #13525 "Rename table does not keep info of triggers".

Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.


mysql-test/t/trigger.test:
  Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
  vardir. Also improved cleanup after the test.

into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


sql/sql_base.cc:
  Auto merged