into  mysql.com:/home/mydev/mysql-5.0-bug8841


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname

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


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

 - Init sql_state in mysql_stmt_init


libmysql/libmysql.c:
  Init sql_state to not_error_sql_state in mysql_init
tests/mysql_client_test.c:
  Add test for mysql_stmt_sqlstate after mysql_stmt_init

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

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

Use the POSIX limits.h define of PATH_MAX for maximum path length.

This has been being hit in pushbuild


ndb/include/util/File.hpp:
  use PATH_MAX for maximum filename length
ndb/src/common/portlib/NdbConfig.c:
  use PATH_MAX for max path name length instead of hardcoding 128
ndb/src/common/util/File.cpp:
  use PATH_MAX for maximum filename length

into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysqldump.c:
  Resolve conflict by using local version

into  mysql.com:/home/jimw/my/mysql-4.1-clean

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

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

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

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

mysql-test/t/disabled.def:
  Enable test case

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

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


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

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/Merge/5.0

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  neptunus.(none):/home/msvensson/mysql/mysql-5.0

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/Merge/5.0


client/mysql.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/log_event.cc:
  Auto merged

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


client/mysql.cc:
  manual merge use local
mysql-test/r/mysqlbinlog.result:
  manual merge use local
mysql-test/t/mysqlbinlog.test:
  manual merge use local
sql/log_event.cc:
  manual merge use local

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

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217

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

into mysql.com:/M41/rpmspec-4.1

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/FIXES/5.0-bug16217

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217

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

into mysql.com:/M50/rpmspec-5.0