into  mysql.com:/opt/local/work/mysql-5.1-merge1

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


sql/event_timed.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

WL#1034 (Internal CRON)


mysql-test/lib/init_db.sql:
  fix for bug #16401, varchar -> char
mysql-test/r/system_mysql_db.result:
  fix the result of the test after pull (currently system_mysql_db is disabled)

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

WL#1034 (Internal CRON)
(not interesting for the Changelog)


mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  update test after pull after comit of fix for bug 16419

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


sql/event_timed.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

into  mysql.com:/opt/local/work/mysql-5.1-merge1

(post-review commit)
WL#1034 (Internal CRON)


sql/event_timed.cc:
  remove bogus check
sql/share/errmsg.txt:
  change error messages
sql/sql_yacc.yy:
  handle error code returned by event_timed::init_starts()

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


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

WL #1034 (Internal CRON)


mysql-test/r/events.result:
  update test result
mysql-test/t/events.test:
  add tests
sql/event_timed.cc:
  - remove stupid check of val_int()
  - fix for bug #16419 (Events: can't use timestamp in the schedule)
    => don't use val_int() but only get_date() and use the date!
sql/share/errmsg.txt:
  - fix an error message, one more "einen"
sql/sql_yacc.yy:
  - handle new return value of event_timed::init_execute_at()

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

missed that one in the previos commit

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

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

into  mysql.com:/opt/local/work/mysql-5.1-merge1


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

into  selena.:H:/MYSQL/src/#00000-mysql-5.1

VC++Files/client/mysqlslap.vcproj:
  Explicit library specification removed from project file
VC++Files/mysql.sln:
  Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln

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

/var/tmp in my path when testing data diretory.  the var directory
exists in a src tree but may not exist in a different testing
build setup.


mysql-test/r/partition_mgm_err.result:
  added a row insert just to make sure the data and index files are made
mysql-test/t/partition_mgm_err.test:
  removed the /var/tmp path elements since there is not guarantee that
  other build setups will include this path

Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :)


client/mysqlslap.c:
  rename
extra/comp_err.c:
  rename
include/my_sys.h:
  replace
mysys/mf_tempdir.c:
  replace
mysys/my_malloc.c:
  replace
mysys/safemalloc.c:
  replace
sql/ha_federated.cc:
  replace
sql/log_event.cc:
  replace
sql/set_var.cc:
  replace
sql/set_var.h:
  replace
storage/myisam/ft_stopwords.c:
  replace

BitKeeper/etc/config:
  why is this not default?

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


mysql-test/t/disabled.def:
  Auto merged

mysql-test/t/disabled.def:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster.cc:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster.h:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster_binlog.cc:
  rbr blobs: write data + dict cache workarounds
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbBlob.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  rbr blobs: write data + dict cache workarounds

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


mysql-test/r/partition_mgm_err.result:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/t/partition_mgm_err.test:
  SCCS merged

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

  Add massive printout when failure detected


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add dumping of replica info
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add dumping of replica info

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

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Add debug printouts
  Fix leak of extents
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add debug printouts

structs in PARTITION_ITERATOR

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


sql/table.cc:
  Auto merged

WL#1034 (Internal CRON)


mysql-test/r/events.result:
  fix results file
mysql-test/t/events.test:
  change test for the fix of bug#16404
sql/lex.h:
  enabled/disabled were only for events, going back to enable/disable
  fix for bug#16404
sql/sql_yacc.yy:
  ENABLED -> ENABLE
  DISABLED -> DISABLE
  fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)

when I ran mysql-test-run

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

sql/parse_file.cc:
  since recently, the "dir" parameter can be 0.

into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push

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

  Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).


sql/table.cc:
  Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).