"CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.


mysql-test/r/sql_mode.result:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case
mysql-test/t/sql_mode.test:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case

into  mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h


client/mysqltest.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
os2/MySQL-Source.icc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/Makefile.am:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/debug.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/debug.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/engine.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/engine.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/main.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/main.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regcomp.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regerror.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regerror.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/my_regex.h:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regexec.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regfree.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/reginit.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/item_cmpfunc.cc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/item_cmpfunc.h:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/mysqld.cc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.

  Append to some of the log files, not overwrite


mysql-test/lib/mtr_process.pl:
  Append to some of the log files, not overwrite

  Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.


mysql-test/mysql-test-run.pl:
  Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.

  Pass on all --skip-* to mysqld


mysql-test/mysql-test-run.pl:
  Pass on all --skip-* to mysqld

into  mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

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

  Added -lz to link using libmysqld


scripts/mysql_config.sh:
  Added -lz to link using libmysqld

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

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

consistent read (Bug #12669).


mysql-test/r/innodb.result:
  Added test results for a checksum test.
mysql-test/t/innodb.test:
  Added test case for a checksum bug #12669.
sql/ha_innodb.cc:
  Use consistent read for checksum table and convert MySQL lock type
  to the TL_READ because at the moment MySQL uses TL_READ_NO_INSERT.

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

into moonbone.local:/work/13356-bug-4.1-mysql

resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.


sql/item.cc:
  Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
  
  Added section to resolve_const_item() for Item_row items. If it can it
  recursively calls resolve_const_item() for each item the Item_row contains. If
  any of the contained items is null then Item_row is substituted by Item_null.
  Otherwise it just returns.
  Comment moved closer to function it belongs to.
mysql-test/t/select.test:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
mysql-test/r/select.result:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.

acl_init".

Updated calls to acl_init()/grant_init() in init_embedded_server() - their
signatures were changed recently, now they don't need argument for passing
pointer to THD object (this code was only compiled if one built embedded
server library with --with-embedded-privilege-control switch).


libmysqld/lib_sql.cc:
  acl_init/grant_init() are now used only at server start up so they always
  allocate temporary THD object and don't need argument for passing pointer
  to it.

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


client/mysqltest.c:
  Manual merge
mysql-test/mysql-test-run.pl:
  patch alredy commited

into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge
mysql-test/t/merge.test:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge

Reduced the precision of the test numbers.
Not all platforms could reproduce the exact numbers.


mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The new test result

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

into  mysql.com:/users/lthalmann/bk/mysql-4.1-max

into  mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

client/mysql.cc:
  Don't use c_ptr() for cgets() and ensure buffer is not overwritten
mysql-test/r/cast.result:
  More test for CAST(0x.... as signed)
sql/opt_sum.cc:
  Fix bugs found during review
  - Changed code to be able to remove one if
  - Ensure that count == 0 only if is_exact_count == TRUE
sql/sql_delete.cc:
  Ensure 'allow_sum_func' is reset before call to setup_conds
sql/sql_lex.cc:
  allow_sum_func doesn't have to be reset for each query
  (It's to be reset in setup_fields() or before call to setup_conds()
sql/sql_load.cc:
  Move set of auto_increment_field_not_null so that it's not set if field value is NULL
sql/sql_prepare.cc:
  allow_sum_func doesn't have to be reset for each query
  (It's to be reset in setup_fields() or before call to setup_conds()
sql/sql_update.cc:
  Ensure 'allow_sum_func' is reset before call to setup_conds

  Disable unstable test cases
  new file


mysql-test/t/disabled.def:
  Disable unstable test cases

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

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

  Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++


scripts/mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
client/mysqltest.c:
  Windows pclose() returns error code in low byte
Makefile.am:
  Revert to shell test script for test targets

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

into mysql.com:/home/psergey/mysql-4.1-bug13419

  Fix out-of-order status variable.


sql/mysqld.cc:
  Fix out-of-order status variable.

After merge fix

mysys/my_init.c:
  Updated after review