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

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

 - 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:/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

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.

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:/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

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


sql/item_func.h:
  Auto merged

  Fix compilation error if HAVE_REPLICATION is not defined


sql/handler.cc:
  Fix compilation error if HAVE_REPLICATION is not defined

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

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


include/my_pthread.h:
  Auto merged

 - Reverted removal of errorcheck mutex initialise, used in safe_mutex_init. 


include/my_pthread.h:
  Reverted the removal of errorcheck mutex initializer
mysys/my_thr_init.c:
  Reverted the removal of errorcheck mutex initializer
  Add destruction of mutex initializer

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

client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
BUILD/SETUP.sh:
  Manual merge of conflicts
  -DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
  manual merge
mysql-test/r/archive.result:
  Manual merge
mysql-test/t/archive.test:
  Manual merge

   - Made a script that selects the best compiler optimizations for the current cpu.
   - Use the script from BUILD/SETUP.sh 


BUILD/SETUP.sh:
  Run check-cpu and use the compiler optimization flags it outputs

  Correct an assertion


sql/ha_innodb.cc:
  Correct an assertion

Added protection against global read lock while creating and
initializing a delayed insert handler.
Allowed to ignore a global read lock when locking the table
inside the delayed insert handler.
Added some minor improvements.


sql/lock.cc:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Changed mysql_lock_tables() to allow for ignoring global read lock.
  Added functions to set/unset protection against global read lock.
sql/mysql_priv.h:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Changed existing and added new function declarations.
sql/sql_insert.cc:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Added and extended some comments.
  Added a protection against global read lock while a handler is
  created and initialized.
  Moved the unlock of the delayed insert object past its last usage
  in delayed_get_table().
  Changed the table locking in handle_delayed_insert() so that it
  does not wait for global read lock.

  Fix compilation error if HAVE_REPLICATION is not defined


sql/mysqld.cc:
  Fix compilation error if HAVE_REPLICATION is not defined
sql/ha_innodb.cc:
  Fix compilation error if HAVE_REPLICATION is not defined

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


configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged

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


configure.in:
  Auto merged

  Fix linking and compilation errors


sql/ha_innodb.cc:
  Fix linking and compilation errors

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


configure.in:
  Auto merged

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

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