into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.

into  mysql.com:/usr/home/ram/work/mysql-5.0

into mysql.com:/home/gluh/MySQL/Merge/5.0


mysql-test/r/binary.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
sql/field_conv.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/mysql-5.0


sql/hostname.cc:
  Auto merged

 removed unnecessary calculation of cache value 
 otherwise Join::preapre tries to calculate 
 undefined values(filed values)


mysql-test/r/type_decimal.result:
  Fix for bug#17826 'type_decimal' fails with ps-protocol
   test case, this test case reproduce the same bug but without PS protocol
mysql-test/t/type_decimal.test:
  Fix for bug#17826 'type_decimal' fails with ps-protocol
   test case, this test case reproduce the same bug but without PS protocol

into  mysql.com:/usr/home/ram/work/5.0.b17615


mysql-test/r/sp.result:
  merging
mysql-test/t/sp.test:
  merging

into  mysql.com:/usr/home/ram/work/4.1.b13659

  Don't create empty embedded RPM, bug#15769


support-files/mysql.spec.sh:
  Don't create empty embedded RPM, bug#15769

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

(ASCII space).  For Bug#16857.


sql/field_conv.cc:
  Bug#16857:  Do not expand BINARY fields as if they are strings (which 
  presumably /should/ be filled with spaces).  Instead, fill BINARY fields
  with 0x00 bytes.

  Use libtool convenience lib, to access get_password object correctly, bug#17155


server-tools/instance-manager/Makefile.am:
  Use libtool convenience lib, to access get_password object correctly, bug#17155

(ASCII space).  For Bug#16857.


sql/field_conv.cc:
  Bug#16857:  Do not expand BINARY fields as if they are strings (which 
  presumably /should/ be filled with spaces).  Instead, fill BINARY fields
  with 0x00 bytes.

into  selena.:H:/MYSQL/src/#17595-mysql-5.0

into  mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0

                 time per connection
  Removed const_string() method from Item_string (it was only used in one
  place, in a bad way). Defer possible SP variable, and access data directly
  instead, in date_format item.


mysql-test/r/sp.result:
  Updated results for new test (BUG#17476).
mysql-test/t/sp.test:
  New test case (BUG#17476)
sql/item.h:
  Removed const_string() from Item_string.
  It was only used in one place, and we can just use str_value in Item directly.
sql/item_timefunc.cc:
  Must defer a (possible) local SP variable to use max_length and str_value
  in Item_func_date_format::fix_length_and_dec(), and refer to str_value
  directly without the const_string() method (now removed); the cast didn't
  work in all cases anyway.

  cloned


configure.in:
  cloned

sql/item_func.cc:
  Fix for bug #17615: invalid handling of function results in UPDATE...SET statement.
  - set proper collation

into mysql.com:/M50/mysql-5.0

mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

database
 - Fix test case for systems with "lowercase names"


mysql-test/r/grant2.result:
  Fix for system with "lowercase names", allow error 1007 to be returned
mysql-test/t/grant2.test:
  Fix for system with "lowercase names", allow error 1007 to be returned

scripts/make_binary_distribution.sh:
  Auto merged

into mysql.com:/M50/mysql-5.0


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

into mysql.com:/home/hf/work/mysql-5.0.9088

into mysql.com:/home/hf/work/mysql-5.0.9088

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  SCCS merged

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged

  revise README.


mysql-test/README:
  revise README.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478

  Revise README.gcov.


mysql-test/README.gcov:
  Revise README.gcov.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1


mysql-test/README:
  Auto merged

  Revise mysql-test README.


mysql-test/README:
  Revise mysql-test README.

into mysql.com:/M40/comment-4.0

into mysql.com:/M41/comment-4.1


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