into mysql.com:/space/my/mysql-4.0

   for the MySQL root user (BUG#2375)


scripts/mysql_install_db.sh:
   - improved wording on what to do to set the password for the MySQL root
     user (BUG#2375)

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

netware/BUILD/compile-linux-tools:
  Need to run make on sql_yacc.cc.
netware/BUILD/compile-netware-END:
  Use .zip package.
netware/BUILD/compile-netware-all:
  Add compile-netware-src.
netware/BUILD/compile-netware-standard:
  Need backslash to avoid error.
netware/BUILD/mwenv:
  Add additional include, library paths, -dialect and -map flags for CW.
netware/BUILD/nwbootstrap:
  Additional status messages, update versions in .def files.
netware/Makefile.am:
  Cosmetic change, add @openssl_libs@ in case of OpenSSL feature usage.
netware/isamchk.def:
  Add SCREENNAME to allow interaction.
netware/my_manage.c:
  Take out unused args to mysqladmin.
netware/myisamchk.def:
  Add SCREENNAME to allow interaction.
netware/myisamlog.def:
  Add SCREENNAME to allow interaction.
netware/myisampack.def:
  Add SCREENNAME to allow interaction.
netware/mysql_test_run.c:
  Multiple changes to help test suite.
netware/mysqlbinlog.def:
  Add SCREENNAME to allow interaction.
netware/mysqlcheck.def:
  Add SCREENNAME to allow interaction.
netware/mysqld_safe.c:
  Make error message more accurate/descriptive.
netware/mysqldump.def:
  Add SCREENNAME to allow interaction.
netware/mysqlimport.def:
  Add SCREENNAME to allow interaction.

The test might fail if one runs it at 23:59:59 Dec 31


mysql-test/r/type_year.result:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
mysql-test/t/type_year.test:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
sql/field.h:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2231

INDEX+LIKE, don't take the ESCAPE character. (ver. 2)

  Start InnoDB Monitor if 80 % of the buffer pool occupied by adaptive has or lock heaps; do not print the same warning more than 1 time


innobase/buf/buf0lru.c:
  Start InnoDB Monitor if 80 % of the buffer pool occupied by adaptive has or lock heaps; do not print the same warning more than 1 time

  DO NOT MERGE TO 4.1: forgot to change this in the previous push


innobase/trx/trx0sys.c:
  DO NOT MERGE TO 4.1: forgot to change this in the previous push

into hundin.mysql.fi:/home/heikki/mysql-4.0

  DO NOT MERGE TO 4.1: charset changes can cause problems in a downgrade 4.1.1 -> 4.0.18


innobase/trx/trx0sys.c:
  DO NOT MERGE TO 4.1: charset changes can cause problems in a downgrade 4.1.1 -> 4.0.18

into mysql.com:/home/mysql_src/mysql-4.0

I had not corrected these languages.
As it has been discussed with the docs team, the new messages will be merged
to 4.1, and then will be translated in 4.1 (they will remain in English
in 4.0).


sql/share/danish/errmsg.txt:
  better error message
sql/share/dutch/errmsg.txt:
  better error message
sql/share/german/errmsg.txt:
  better error message
sql/share/italian/errmsg.txt:
  better error message
sql/share/portuguese/errmsg.txt:
  better error message
sql/share/russian/errmsg.txt:
  better error message
sql/share/spanish/errmsg.txt:
  better error message
sql/share/swedish/errmsg.txt:
  better error message
sql/share/ukrainian/errmsg.txt:
  better error message

  DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet


innobase/include/srv0srv.h:
  DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet
innobase/include/trx0sys.h:
  DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet
innobase/ibuf/ibuf0ibuf.c:
  DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet
innobase/srv/srv0start.c:
  DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet
innobase/trx/trx0sys.c:
  DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet

(acctually i don't like the fix, any suggestions?)

sql/set_var.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged

Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)


client/mysqltest.c:
  Indentation cleanup
include/myisam.h:
  Made some pointers 'const'
mysql-test/mysql-test-run.sh:
  Portability fix for OSX
sql/filesort.cc:
  Safety fix (not needed for current code but needed for 5.0)
sql/ha_berkeley.cc:
  More debugging
  Changed 'create' to return error number
sql/ha_berkeley.h:
  Added HA_FILE_BASED
sql/ha_innodb.cc:
  Added missing DBUG_RETURN
sql/ha_isam.cc:
  Changed create to return error number
sql/ha_isam.h:
  Added HA_FILE_BASED
sql/ha_isammrg.h:
  Added HA_FILE_BASED
sql/ha_myisam.cc:
  Changed create to return error number
sql/ha_myisam.h:
  Added HA_FILE_BASED
sql/ha_myisammrg.cc:
  Changed create to return error number
sql/ha_myisammrg.h:
  Added HA_FILE_BASED
sql/handler.cc:
  Ensure that table engines gets table names in lower case even if we are using lower_case_table_names
  Removed test for DB_TYPE_INNODB by ensuring that create method returns error number.
sql/handler.h:
  Added HA_FILE_BASED
  Made some struct entries 'const'
  Added 'alias' for create to be able to create tables in mixed case on case insensitive file systems
sql/mysql_priv.h:
  Support for lower_case_table_names=2
sql/mysqld.cc:
  Support for lower_case_table_names=2
  Moved test of case insenstive file system after all mutex are created
sql/set_var.cc:
  Support for lower_case_table_names=2
sql/sql_class.h:
  Indentation change
sql/sql_db.cc:
  Support for lower_case_table_names=2
sql/sql_insert.cc:
  Indentation change
sql/sql_parse.cc:
  Support for lower_case_table_names=2
sql/sql_rename.cc:
  Support for lower_case_table_names=2
  Added missing 'unpack_filename' to RENAME which may fix a bug in RENAME TABLE on windows
sql/sql_show.cc:
  If lower_case_table_name=2 is given, show original case in SHOW CREATE TABLE
sql/sql_table.cc:
  Support for lower_case_table_names=2 for DROP TABLE, RENAME TABLE, ALTER TABLE and CREATE TABLE

into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.0

  Like did not work in some cases
  ,


strings/ctype-big5.c:
  Like did not work in some cases
  ,
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Do not assert in log0log.c, line 856 if ib_logfiles are too small for innodb_thread_concurrency. Instead, print instructions how to adjust my.cnf and call exit(1).


innobase/log/log0log.c:
  Do not assert in log0log.c, line 856 if ib_logfiles are too small for innodb_thread_concurrency. Instead, print instructions how to adjust my.cnf and call exit(1).

   (BUG#2156)


support-files/mysql.spec.sh:
   - marked /etc/logrotate.d/mysql as a config file (BUG#2156)

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

Bug #2163

into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged

Fixed not updated test from last changeset


mysql-test/r/auto_increment.result:
  Updated results
sql/mysqld.cc:
  Cleaned up pid file handling (to remove compiler warning)

mysql-test/t/auto_increment.test:
  Fixed wrong comment
sql/opt_range.cc:
  Removed not used variable
sql/sql_select.cc:
  Removed indentation level (This will also make merges into 4.1 easier)

client/mysql.cc:
  Don't call mysql_close() on not initialized object
sql/field.cc:
  code cleanup

into mysql.com:/my/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

release the mutex before exiting the function, or it will be kept forever
(=> START SLAVE, STOP SLAVE, etc will hang).


sql/slave.cc:
  release the mutex before exiting the function, or it will be kept forever
  (=> START SLAVE, STOP SLAVE, etc will hang).

(bug #2086)


include/mysqld_error.h:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
mysql-test/r/variables.result:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
mysql-test/t/variables.test:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/set_var.cc:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/czech/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/danish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/dutch/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/english/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/estonian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/french/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/german/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/greek/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/hungarian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/italian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/japanese/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/korean/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/norwegian-ny/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/norwegian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/polish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/portuguese/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/romanian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/russian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/slovak/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/spanish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/swedish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/ukrainian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type

into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0


sql/field.cc:
  Auto merged

(char * -> const char*)


sql/field.cc:
  fixed small error in types (char * -> const char*)