into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0

into moonbone.local:/work/16272-bug-5.0-mysql

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0

The Item_func_if::fix_length_and_dec() function when calculating length of 
result doesn't take into account unsigned_flag. But it is taken when 
calculating length of temporary field. This result in creating field that 
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.

The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
the unsigned_flag isn't set.


sql/item_cmpfunc.cc:
  Fixed bug#16272: IF function with decimal args can produce wrong result
  The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
  the unsigned_flag isn't set.
mysql-test/r/func_if.result:
  Added test case for bug#16272: IF function with decimal args can produce wrong result
mysql-test/t/func_if.test:
  Added test case for bug#16272: IF function with decimal args can produce wrong result

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0

into moonbone.local:/work/16752-bug-5.0-mysql


sql/sql_select.cc:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.0.cs_fs


sql/set_var.cc:
  Auto merged

  Backporting character_set_filesystem from 5.0 to 5.1.


sql/mysqld.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.h:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.h:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_yacc.yy:
  Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/t/variables.test:
  Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/r/variables.result:
  Backporting character_set_filesystem from 5.0 to 5.1.

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0

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

  Fix out-of-order system variable.


sql/set_var.cc:
  Fix out-of-order system variable.

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0

into mysql.com:/M50/rpmspec-5.0

into  selena.:H:/MYSQL/bkt/mysql-5.0


mysys/my_init.c:
  Auto merged

into  selena.:H:/MYSQL/src/#06536-mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.


sql/ha_archive.cc:
  Fix for leaked share and hidden rows.
sql/ha_archive.h:
  Change in method

add optional reporting of of a "name" tied to a nodeid in the cluster log
reporting added for mysql server and ndb_restore

mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/spatial.cc:
  Auto merged

  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0


mysql-test/lib/mtr_process.pl:
  Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
  Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test/lib/mtr_report.pl:
  Parse error logs to create "warnings" file
sql/spatial.cc:
  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged

  print => echo in shell script


scripts/make_binary_distribution.sh:
  print => echo in shell script

into  mysql.com:/usr/local/mysql/mysql-4.1-fixrace

into  mysql.com:/usr/local/mysql/mysql-5.0


mysql-test/lib/mtr_process.pl:
  Auto merged

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

  Give space for second and third slave port


mysql-test/mysql-test-run.pl:
  Give space for second and third slave port
  Define shell variables for all ports, and
  list these at startup
mysql-test/mysql-test-run.sh:
  Give space for second and third slave port

errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.


mysql-test/lib/mtr_process.pl:
  Fix race (on some platforms) when killing processes.

  Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave


mysql-test/mysql-test-run.sh:
  Give port space for more than one slave
mysql-test/mysql-test-run.pl:
  Display instance manager port

mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Rearranged the port numbers to fit into the range

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

support-files/mysql.spec.sh:
  Manual merge: new "-i" in "make -i test-force", changelog.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge
mysql-test/t/ndb_basic.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge

Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead


mysql-test/r/ndb_basic.result:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

support-files/mysql.spec.sh:
  Use "-i" on "make test-force";
  this will prevent "make" from writing "***" which in turn was treated as a _build_ error
  by the log evaluation tool, causing it not to list the failing tests.

into  mysql.com:/home/cps/mysql/devel/5.0-mike

into  mysql.com:/home/cps/mysql/devel/5.0-mike