into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug9821


sql/sql_parse.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug9298-merge

configure.in:
  Fix typo

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


configure.in:
  Auto merged

Setting AC_PREREQ required version to 2.50 until we have sorted out what is required. The manual says 2.58.


configure.in:
  Removing duplicate AC_PREREQ macros

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

BUILD/check-cpu:
  Remove the exit 0 from check-cpu

value into a char field": the patch submitted for the bug a while
ago has never been reviewed or approved to push into 4.0. Decimal
support in 5.0 resolves the issue.
Adding the test case and closing the bug report.


mysql-test/r/type_decimal.result:
  Bug#5673: test results fixed.
mysql-test/t/type_decimal.test:
  A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal 
  value into a char field"

mysql-test/r/archive.result:
  Warning will be pushed when renaming table with "optional" files.

sql/examples/ha_archive.cc:
  SCCS merged
sql/examples/ha_archive.h:
  SCCS merged
sql/handler.cc:
  SCCS merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

 - Remove ha_archive::rename_table and move the fix to handler::rename_table


sql/examples/ha_archive.cc:
  Remove ha_archive::rename_table
sql/examples/ha_archive.h:
  Remove ha_archive::rename_table
sql/handler.cc:
  Fix handler::rename_table so it does not care about if the file to rename is missing

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes

BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

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


configure.in:
  Auto merged

After merge fix.

 - Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.


mysql-test/r/archive.result:
  Warning is not produced anymore
sql/examples/ha_archive.cc:
  Change ha_archive::rename_table to avoid warning when trying to rename non existent file.

mysql-test/r/archive.result:
  Changed order of tests so that the are before the unpredictable INSERT DELAYED
  Warning is produced during the rename
mysql-test/t/archive.test:
  Changed order of tests so that the are before the unpredictable INSERT DELAYED
  Warning is produced during the rename

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


configure.in:
  Auto merged

Merge from 4.1


configure.in:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
sql/sql_insert.cc:
  Auto merged

After merge fix.

into mysql.com:/home/psergey/mysql-5.0-bug9298-merge


mysql-test/r/group_by.result:
  Auto merged
sql/protocol.cc:
  Auto merged

sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

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


ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

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

BUILD/check-cpu:
  Remove defaul flag i386 and add a check to see wheter to set check_cpu_cflags or not.

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/home/pem/work/mysql-5.0


sql/item_func.cc:
  Auto merged

(Review on irc by monty)


mysql-test/r/sp-error.result:
  Renamed a procedure and function to avoid confusion
mysql-test/t/sp-error.test:
  Renamed a procedure and function to avoid confusion
sql/item_func.cc:
  Corrected (and better) way to set/reset the client cap. flag in Item_func_sp::execute()
sql/share/errmsg.txt:
  Changed the ER_SP_BADSELECT error; more accurate, and includes the procedure name.
sql/sql_parse.cc:
  Include the procedure name in the new error message.

mysql-test/r/func_math.result:
  after merge fix:
  the test should be added after we have new hf's pm code pushed.
mysql-test/t/func_math.test:
  after merge fix:
  the test should be added after we have new hf's pm code pushed.

ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/item_func.cc:
  ul used, as hf said he has a patch for this code.

into mysql.com:/M41/mysql-4.1

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