Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE


innobase/btr/btr0sea.c:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23 (to remove duplicate casedn_str())

  More descriptive foreign key error messages


sql/share/english/errmsg.txt:
  More descriptive foreign key error messages

  Remove an assertion which can fail in a race of 3 threads


innobase/btr/btr0sea.c:
  Remove an assertion which can fail in a race of 3 threads

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged

into sergbook.mysql.com:/usr/home/serg/Abk/mysql

configure.in:
  Auto merged

This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug


Docs/mysqld_error.txt:
  Added new error message
acinclude.m4:
  Fix for configure problem on OpenUnix
configure.in:
  Fix for OpenUnix
  Added C and C++ versions to mysqlbug
mysql-test/r/variables.result:
  Update of max_join_size handling
mysql-test/t/variables.test:
  Update of max_join_size handling
mysys/Makefile.am:
  Removed duplicate row
mysys/my_alloc.c:
  Safety fixes (not fatal)
scripts/Makefile.am:
  Added C and C++ compiler versions to mysqlbug
scripts/mysqlbug.sh:
  Added C and C++ compiler versions to mysqlbug
sql/item_func.cc:
  Fixed that user variables that changes are not threated as constants.
sql/item_func.h:
  Fixed that user variables that changes are not threated as constants.
sql/mysqld.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/repl_failsafe.cc:
  Removed not needed cast
sql/set_var.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/set_var.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/slave.cc:
  Removed not needed cast
sql/sql_class.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/sql_parse.cc:
  Removed not needed cast
  Fixed security problem with mysql_drop_db()
sql/sql_show.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/structs.h:
  Changed thd variables max_join_size and select_limit to type ha_rows

 - bumped up version number in configure.in to 4.0.7-gamma


configure.in:
   - bumped up version number in configure.in to 4.0.7-gamma

  Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition


sql/ha_innobase.cc:
  Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition

  Corrected some typo.


sql-bench/server-cfg.sh:
  Corrected some typo.

into mysql.com:/home/walrus/bk/40

  Wrap long lines,
  New test - date_format_inresult (returns which date
  format dbms uses in the result set)
  New tests:
    -date_format_ISO 
    -date_format_ISO_with_date (checks if DBMS supports 
          YYYY-MM-DD or DATE 'YYYY-MM-DD' formats)
    -date_format_EUR
    -date_format_EUR_with_date (the same but 'DD.MM.YYYY' 
          format)
    -date_format_USA
    -date_format_USA_with_date ( the same but 'MM/DD/YYYY' format)
    -date_format_YYYYMMDD
    -date_format_YYYYMMDD_with_date 


sql-bench/crash-me.sh:
  Wrap long lines,
  New test - date_format_inresult (returns which date
  format dbms uses in the result set)
  New tests:
    -date_format_ISO 
    -date_format_ISO_with_date (checks if DBMS supports 
          YYYY-MM-DD or DATE 'YYYY-MM-DD' formats)
    -date_format_EUR
    -date_format_EUR_with_date (the same but 'DD.MM.YYYY' 
          format)
    -date_format_USA
    -date_format_USA_with_date ( the same but 'MM/DD/YYYY' format)
    -date_format_YYYYMMDD
    -date_format_YYYYMMDD_with_date

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

sql/sql_db.cc:
  fix for lower case ...

into mysql.com:/home/walrus/bk/40

sql-bench/crash-me.sh:
  add tagline for emacs 
  add log lines to result file
  remove wrong prompt for WEEK()
sql-bench/server-cfg.sh:
  cleanup field conversation

(Accidently disabled by a recent push)

  Add to perror the code 150 about wrong foreign key def


extra/perror.c:
  Add to perror the code 150 about wrong foreign key def

database and lower case table names.

into mashka.mysql.fi:/home/my/mysql-4.0


mysys/my_rename.c:
  Auto merged

This fixes a bug with REPAIR TABLE t1 USE_FRM on windows.


mysys/my_rename.c:
  On windows, delete any conflicting 'to' files on rename(from,to)

configure.in:
  merge with 3.23
sql/log.cc:
  Use local file
sql/mysqld.cc:
  Get patch for lower_case_table_names for MacOSX

Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100)


myisam/mi_check.c:
  Fixed bug in copying statistics for disabled index
mysql-test/r/distinct.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/fulltext.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/insert.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/key_diff.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/order_by.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/select.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/show_check.result:
  Fix result after not doing key statistics for first insert.
sql/ha_myisam.cc:
  Don't disable index when inserting only a few rows
sql/log.cc:
  Transactions in AUTOCOMMIT=0 mode didn't rotate binary log.
sql/sql_insert.cc:
  Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT

sql/sql_yacc.yy:
  Fixed syntax error (with bison 1.75).

   in sql/ha_myisammrg.h (removed "ha_myisammrg::")

configure.in:
  merge with 4.0
scripts/mysqld_safe.sh:
  Don't apply patch from 3.23

tables.  This removes a possible deadlock situation.