after another merge fixes.


mysql-test/r/information_schema.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/mysqlcheck.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/sp.result:
  WL #1034 (Internal CRON)
  fix result
sql/event.cc:
  after fixes for WL1012 fix these to be able to compile
sql/event_timed.cc:
  after fixes for WL1012 fix these to be able to compile
sql/share/errmsg.txt:
  readd error messages removed during manual update
sql/sql_yacc.yy:
  fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
  merge. The merge wasn't good :(

sql/Makefile.am:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''

fix errmsg.txt


sql/share/errmsg.txt:
  fix errmsg.txt so being able to build it

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

merge before push


BUILD/SETUP.sh:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
libmysqld/Makefile.am:
  manual merge
mysql-test/r/information_schema.result:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_lex.h:
  manual merge
sql/sql_yacc.yy:
  manual merge

- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
  variables are very nice but extremely error-prone (Count one more
  time just to be sure).


mysql-test/r/connect.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/events.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/grant.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/information_schema.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/lowercase_table_grant.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/ps.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/system_mysql_db.result:
  fix result for WL#1034 (internal CRON)
mysql-test/t/events.test:
  fix result for WL#1034 (internal CRON)
sql/sql_yacc.yy:
  - fix bug introduced by me when making usage of temporal
    bison variables. COUNT 7 times then write!

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration

  added I_S 'PARTITIONS' table

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged

client/mysqltest.c:
  Allocate one extra byte for string terminator in varname

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
sql/sql_select.cc:
  Auto merged

client/mysqltest.c:
  Revert to original version of copying name and value into var in var_init

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0

There is a specific rpl_ignore_grant test case for GRANT.


mysql-test/r/rpl_ignore_revoke.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration

(pre-push cleanups removing debugging code)


sql/event.cc:
  - comment
  - fix 80 cols
  - fix a crash when dropping a running event (after it has finished
    its work because the memory got freed in remove_from_cache but the event
    was still running)
sql/event.h:
  - add new method
sql/event_executor.cc:
  - remove printf-s
  - fix 80cols
  - fix message

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

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration

into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598

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

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
include/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqlslap.result:
  Real output produced, remove "echo"
mysql-test/t/mysqlslap.test:
  Real output produced, remove "echo"

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

sql/ha_archive.h:
  Removed unneeded include.

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

mysql-test/r/archive.result:
  New result file.
mysql-test/t/archive.test:
  Added new tests for indexes. Also accidently updated it so that all "FROM" are now capitalized :)
sql/ha_archive.cc:
  Changed comparision function to compare memory locations. 
  
  Modified function for storing the auto_increment. 
  Removed useless DBUG_PRINT

  Fix word.
  (no test results needed fixing)


sql/share/errmsg.txt:
  Fix word.
  (no test results needed fixing)

into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups


sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  accepted Mat's changes to the template defs

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

mysql-test/r/mysqlslap.result:
  Update test result
mysql-test/t/mysqlslap.test:
  Print something when test is complete

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/mysqltest.test:
  Changed to "test ! -e" instead of "test -s"

into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598

into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem

configure.in:
  1) Update version, now that 5.1.5 has been cloned.
  2) Get rid of erroneous merge, NDB version is deduced automatically from global version.

into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


sql/sql_acl.cc:
  Auto merged