into  mysql.com:/usr/local/mysql/mysql-5.1-merge


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  SCCS merged

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


storage/myisam/ft_boolean_search.c:
  Auto merged

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

  more printouts...


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  printouts
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  printouts
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  printouts

This patch also fixes annoying complains on the log tables
absence, issued by the shell version of mysql-test-run.


sql/log.h:
  check for the table log handler presence, as now it
  could be absent in some cases. Namely, during bootstrap.
sql/mysqld.cc:
  do not create log table handler, if run
  in bootstrap mode.

  even more debug printouts


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  more printouts...

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  more printouts
  write tabfile sync

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


sql/handler.h:
  Auto merged

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-new-wl2986

Final patch
-----------

This WL is about using this bitmap in all parts of the partition handler.
Thus for:
rnd_init/rnd_next
index_init/index_next and all other variants of index scans
read_range_... the various range scans implemented in the partition handler.

Also use those bitmaps in the various other calls that currently loop over all
partitions.




mysql-test/r/partition_pruning.result:
  WL# 2986
  
  New results reflecting bitmap being used to determine if a partition is to be
  included
mysql-test/t/partition_pruning.test:
  WL# 2986
  
  New tests to show bitmap being used in ha_partition
sql/ha_partition.cc:
  WL# 2986
  
  Used work from 2682 and removed the partition select code.
      
  Added do {} while loop to any iteration over partitions to now utilise 
  m_part_info->used_partitions bitmap to determine if a partition should be
  used.
sql/ha_partition.h:
  WL# 2986
  
  Removed unused member
sql/handler.h:
  WL# 2986
  
  Removed unused member
sql/opt_range.cc:
  WL# 2986
  
  Added bitmap_clear_all to clear bitmap prior to pruning
  DBUG code for testing
sql/sql_partition.cc:
  WL# 2986
  
  Changed < to <=, which fixes the problem with edge cases going awry.

sql/sp.cc:
  use strxnmov, just in case
sql/sql_parse.cc:
  init thd->security_ctx->priv_host,
  otherwise - buffer overflow in db_create_routine
sql/unireg.cc:
  not too nice to do bzero(buf, 9) after char buf[5], eh ?

mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  SCCS merged

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

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

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

mysql-test/t/disabled.def:
  blobs: set_null is not enough, must also set empty buffer
sql/ha_ndbcluster.cc:
  blobs: set_null is not enough, must also set empty buffer

into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1-bug15820

It is ok for a partitioned table to have only 1 partition.  This test is just to show that
doing the ALTER TABLE ADD PARTITION doesn't crash the server.

partition_mgm_err.result:
  Added result block for test of bug #15820
partition_mgm_err.test:
  Added test block for bug #15820


mysql-test/t/partition_mgm_err.test:
  Added test block for bug #15820
mysql-test/r/partition_mgm_err.result:
  Added result block for test of bug #15820

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  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug

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

sql/log.cc:
  split logging cleanup function in two
  and do actual delete of the log event
  handlers
sql/log.h:
  split logging cleanup function in two
sql/mysqld.cc:
  split logger cleanup in two phases

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)