into  mysql.com:/usr/home/ram/work/mysql-5.1-maint

When partition pruning is used we have to initialize key_part->flag in the 
create_partition_index_descr() as it's checked in the get_mm_leaf().


sql/opt_range.cc:
  Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well)
    - set key_part->flag to 0.
sql/opt_range.h:
  Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well)
    - comment added.

into  mysql.com:/usr/home/ram/work/bug22913/my51-bug22913

- 'false' not defined in C, use FALSE instead.


mysys/my_lock.c:
  Fixed error for windows built:
  'false' not defined in C, use FALSE instead.

into  mysql.com:/usr/home/ram/work/bug22913/my51-bug22913


client/mysql.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22913/my51-bug22913


client/mysql.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913


client/mysql.cc:
  Auto merged

We don't check for errors that may occur during data printing.


client/mysql.cc:
  Fix for bug #22913: mysql --quick doesn't report some errors.
    - check for errors after the data output.

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_lock.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint


mysys/my_chsize.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
mysys/mf_iocache.c:
  Merged patch:
  - Moved comments
  - Moved check on return value of my_seek.

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysys/my_chsize.c:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rename.test:
  Manual mereg

 - Only read *.pid
 - Only allow it to contain a number 


mysql-test/lib/mtr_io.pl:
  Check that the value read from pidfile is a valid number consisting only of digits
mysql-test/lib/mtr_process.pl:
  Only process .pid files in var/run dir and print a warning if other files are found there.

client/mysqltest.c:
  Make the variables that are referenced from the "command_arg" arrays static to please the NetWare compiler.
  Apparently the arrays can't reference local stack variables.

into  mysql.com:/usr/home/ram/work/bug22723/my50-bug22723


sql/sql_show.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22723/my51-bug22723


sql/sql_show.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22723/my51-bug22723


sql/sql_show.cc:
  Auto merged

- Because my_seek actually is capable of returning an error code we should
  exploit that in the best possible way.
- There might be kernel errors or other errors we can't predict and capturing
  the return value of all system calls gives us better understanding of
  possible errors.


mysys/mf_iocache.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_chsize.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_lock.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_seek.c:
  - Added comments

into  mysql.com:/usr/home/ram/work/bug23412/my41-bug23412

into  mysql.com:/usr/home/ram/work/bug23412/my50-bug23412


sql/sql_delete.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug23412/my51-bug23412

into  mysql.com:/usr/home/ram/work/bug23412/my51-bug23412


sql/sql_delete.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug23412/my50-bug23412


sql/sql_delete.cc:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

 - Wait in loop with small sleep until tables has been renamed


mysql-test/t/rename.test:
  To avoid scheduling effects wait for the tables to be renamed in a loop with small sleeps
  before continuing with tests
mysql-test/include/wait_for_query_to_suceed.inc:
  New BitKeeper file ``mysql-test/include/wait_for_query_to_suceed.inc''

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/mysqld.cc:
  Manual merge
storage/myisam/sort.c:
  Manual merge

It's not possible to flush the global status variables in 5.0
Update test case so it works by recording the value of handle_rollback
before and compare it to the value after


mysql-test/r/innodb_mysql.result:
  Update result file
mysql-test/t/innodb_mysql.test:
  It's not possible to reset the global status variables in 5.0 so intead its value
  is recorded and compared to the after value.
  It should not have changed.
sql/mysqld.cc:
  Improve comments
sql/set_var.cc:
  Improve comments
sql/sql_class.cc:
  Improve comments
sql/sql_class.h:
  Improve comments

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value


mysql-test/r/delete.result:
  Fix for bug #23412: delete rows with null date field
    - test result
mysql-test/t/delete.test:
  Fix for bug #23412: delete rows with null date field
    - test case
sql/sql_delete.cc:
  Fix for bug #23412: delete rows with null date field
    - during SELECT queries processing we convert 'date[time]_field is null'                   
      conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null                  
      DATE and DATETIME fields. To be consistent, we have to do the same for DELETE            
      queries. So we should call remove_eq_conds() in the mysql_delete() as well.              
      Also it may simplify and speed up DELETE queries execution.

into  mysql.com:/usr/home/ram/work/bug22158/my50-bug22158

into  mysql.com:/usr/home/ram/work/bug22158/my51-bug22158

into  mysql.com:/usr/home/ram/work/bug22158/my51-bug22158


sql/sql_parse.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/sql_select.cc:
  Auto merged

include/mysql_h_abi.ic:
  Update for 5.1, don't include the info_buffer it should be an error

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/Makefile.am:
  Manual merge