into debian.(none):/M51/mysql-5.1

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

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix ref counts wrt alter table
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix trick goto, getting compile error on some platforms

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

storage/ndb/src/kernel/blocks/lgman.cpp:
  Register thread start also on SR

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Add dump for object/ref count
  Fix ref count on SR

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

storage/ndb/src/kernel/blocks/lgman.cpp:
  Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load

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

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

into debian.(none):/M51/mysql-5.1

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

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

  fix bug in LCP + extent alloc


storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  fix for page allocation
storage/ndb/src/kernel/blocks/pgman.cpp:
  Fix LCP in pgman with more than 32 pages in one bucket
storage/ndb/src/kernel/blocks/tsman.cpp:
  ifdef printouts

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 debian.(none):/M51/mysql-5.1

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 debian.(none):/M51/mysql-5.1

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

storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  qd fix for inconsistency tsman/tup
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Increase extent pool
storage/ndb/src/kernel/blocks/pgman.cpp:
  Increase page entry pool
  Run LCP loop wo/ continueb
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix creating of datafiles with more than 1 extent page

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

into debian.(none):/M51/mysql-5.1

/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