server"
Bug appears only on Windows platform. Freeing memory in 
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in 
setup_copy_fields() results in memory destruction. In test IF used instead 
of CONCAT because IF have more stable crash.



sql/sql_select.cc:
  Fix bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server
mysql-test/t/count_distinct.test:
  test for bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server
mysql-test/r/count_distinct.result:
  Test for bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server

mysql-test/r/union.result:
  Convert back the latin1 characters that where accidently changed during last merge
mysql-test/t/union.test:
  Convert back the latin1 characters that where accidently changed during last merge

 - Add O_SHARE when opening file.


sql/log.cc:
  Add O_SHARE when opening file. This is from mysql-4.1 but since function has been moved from sql_repl.cc, it was missed during merge.

into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged

into mysql.com:/M50/mysql-5.0


sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

mysql-test/r/select.result:
  Corrected merge error (two test blocks inserted in wrong order).

Moved detection of wrong decimal fields before decimal field was created to avoid ASSERT() for DECIMAL(1)

client/client_priv.h:
  Correction of merge mishandling.

mysql-test/t/select.test:
  SCCS merged

client/mysqldump.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
client/client_priv.h:
  Manual merge (still to be corrected!)

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

ndb/src/common/debugger/SignalLoggerManager.cpp:
  Remove unused arg

into neptunus.(none):/home/msvensson/mysql/bug9879

  Updated test data in system tables


mysql-test/lib/init_db.sql:
  Updated test data in system tables

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


myisammrg/myrg_open.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
sql/unireg.cc:
  Auto merged

fix from the main 5.0 tree. (Bug #10687)


myisammrg/myrg_open.c:
  Call fn_format() if file has a path.
mysys/my_getwd.c:
  Check for '/' even if it is not FN_LIBCHAR in has_path()

sql/item.cc:
  Move function to make it easier to debug
sql/item.h:
  Move function to make them easier to debug

sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/data0/mysqldev/tomas/mysql-5.0-build

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


sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

We will however give a warning when opening such a table that users should use ALTER TABLE ... FORCE to fix
the table. In future release we will fix that REPAIR TABLE will be able to handle this case


sql/sql_lex.h:
  Support for ALTER TABLE ... FORCE
sql/sql_table.cc:
  CHECK TABLE now gives a note if table->s->crashed was set
sql/sql_yacc.yy:
  Support for ALTER TABLE ... FORCE
sql/table.cc:
  
  Fix that we can read tables with the 'older' decimal format used in 5.0.3 & 5.0.4
  (Now we store display length in the .frm table while we previously stored precision)
sql/table.h:
  Store in TABLE_SHARE version number of MySQL where table was created (or checked)

Added ASSERT() to detect wrongly packed fields


sql/field.h:
  Fixed comments to right format
sql/opt_range.cc:
  Merged code
sql/sql_base.cc:
  Fixed indentation
sql/sql_insert.cc:
  Fixed comments to right format
sql/sql_select.cc:
  Simplify code
sql/unireg.cc:
  Simply code for calculating key_buff_length
  Added ASSERT() to detect wrongly packed fields

Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)


support-files/mysql.spec.sh:
  Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken.
  (bug#10674, bug#10681)

Merge with latest yaSSL, fix compilation error for SSE2 processors.


extra/yassl/include/yassl_int.hpp:
  Merge with latest yaSSL.
extra/yassl/src/log.cpp:
  Merge with latest yaSSL.
extra/yassl/src/yassl_int.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/integer.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
  Fix compilation error for SSE2 processors.

  innobase_shutdown_for_mysql(): Do very fast shutdown
  only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
  (Bug #9673)


innobase/srv/srv0start.c:
  innobase_shutdown_for_mysql(): Do very fast shutdown
  only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
  (Bug #9673)

ndb/src/common/util/File.cpp:
  my_stat returns NULL on failure, not non-zero.
  
  i.e. exactly the opposite of stat(2).
  
  providing confusion for unix programmers, who expect errors to be non-zero.
  
  Clean up File_class::exists(char*) to use the my_stat interface properly.

BUILD/check-cpu:
  Add no_march variable to indicate that this architecture doesn't support the -march flag to GCC

into xiphis.org:/usr/home/antony/work2/p3-bug7241.6

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-5.0-bg5860

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge