Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.


Build-tools/Do-compile:
  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.

used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.


client/mysql.cc:
  Removed extra handle_optins()'s parameter.
client/mysqladmin.c:
  Removed extra handle_optins()'s parameter.
client/mysqlbinlog.cc:
  Removed extra handle_optins()'s parameter.
client/mysqlcheck.c:
  Removed extra handle_optins()'s parameter.
client/mysqldump.c:
  Removed extra handle_optins()'s parameter.
client/mysqlimport.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanager-pwgen.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanagerc.c:
  Removed extra handle_optins()'s parameter.
client/mysqlshow.c:
  Removed extra handle_optins()'s parameter.
client/mysqltest.c:
  Removed extra handle_optins()'s parameter.
extra/my_print_defaults.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_install.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_waitpid.c:
  Removed extra handle_optins()'s parameter.
extra/perror.c:
  Removed extra handle_optins()'s parameter.
extra/resolve_stack_dump.c:
  Removed extra handle_optins()'s parameter.
extra/resolveip.c:
  Removed extra handle_optins()'s parameter.
include/my_getopt.h:
  Removed extra handle_optins()'s parameter.
isam/isamchk.c:
  Removed extra handle_optins()'s parameter.
isam/pack_isam.c:
  Removed extra handle_optins()'s parameter.
myisam/mi_test1.c:
  Removed extra handle_optins()'s parameter.
myisam/myisam_ftdump.c:
  Removed extra handle_optins()'s parameter.
myisam/myisamchk.c:
  Removed extra handle_optins()'s parameter.
myisam/myisampack.c:
  Removed extra handle_optins()'s parameter.
sql/gen_lex_hash.cc:
  Removed extra handle_optins()'s parameter.
sql/mysqld.cc:
  Removed extra handle_optins()'s parameter.
tools/mysqlmanager.c:
  Removed extra handle_optins()'s parameter.

functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.
(backport from 4.1)


include/m_string.h:
  Extend the "fake" approach from 'strtoull()' onto 'strtoll()'
  (backport from 4.1).
strings/strto.c:
  Ensure that calling file has included necessary headers,
  as these are needed at the upper level already
  (backport from 4.1).
strings/strtol.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoll.c:
  When "long" is 64 bit already, system function 'strtol()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough (backport from 4.1).
strings/strtoul.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoull.c:
  When "long" is 64 bit already, system function 'strtoul()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough (backport from 4.1).

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

   with the sleep value we use for the test suite run during the
   release builds


BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Delete: mysql-test/t/flush_block_commit-master.opt

  Fixed missing * in comment in setup_windows_event_source


sql/log.cc:
  Fixed missing * in comment in setup_windows_event_source

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


sql/log.cc:
  Auto merged

We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.


sql/log.cc:
  When SET CHARACTER SET has been used, we must reset the charset after the writing the statement, in the binlog.
  In 4.1, this resetting is already achieved by the SET ONE_SHOT syntax.
sql/log_event.cc:
  In slave, we must not simply reset the charset after each statement: if we do this, the charset gets
  immediately after executing the SET CHARACTER SET! (BUG#4500).

Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()


mysql-test/r/lowercase_table.result:
  Changed foo database -> mysqltest
  More test cases
mysql-test/t/lowercase_table.test:
  Changed foo database -> mysqltest
  More test cases
mysys/my_getopt.c:
  Fix new code to use MySQL indentation style
sql/log.cc:
  Change to use MySQL indentation style and naming conventions
  Remove usage of strlen() and strcat()
sql/mysqld.cc:
  Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
sql/sql_base.cc:
  Added comment
sql/table.cc:
  Added #if MYSQL_VERSION_ID < 40100 to ensure code is merged correctly

or --with-extra-charsets=complex is given.

  Bug #4558 Escape handling error for ENUM values in SJIS encoding


sql/table.cc:
  Bug #4558 Escape handling error for ENUM values in SJIS encoding

  Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110


sql/share/charsets/win1251.conf:
  Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into build.mysql.com:/users/rburnett/mysql-4.0

This file was part of the patch for 
Bug #4466  	Nothing in .err when mysql service ends because of malformed my.ini options 

message.mc:
  new file

   when pulling BK trees before.


Build-tools/Bootstrap:
   - thinko fix: we need to run the "bk pull" command on its own, if
     we want to get its return value...

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

into hegel.txg.br:/home/miguel/bk/mysql-4.0

into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged

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

   of MySQL (BUG#3860)

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

into mysql.com:/M40/mysql-4.0

sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge (use new code)

Update to new valgrind


mysql-test/mysql-test-run.sh:
  Update for new valgrind
sql/mysql_priv.h:
  Remove default argument to mysql_truncate()
sql/sql_parse.cc:
  Remove default argument to mysql_truncate()

lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792


mysql-test/t/lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
mysql-test/r/lowercase_table.result:
  New results for modified lowercase_table test

sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792


sql/sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792

This was a customer request for to get the XP Logo Certification.

Note for LenZ:
Adding to the project libmysqld.dsp the file libmysqld.rc at compilation time will be created
the libmysqld.res and this linked. For every release edit the libmysqld.rc
version number.

into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

  Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.


innobase/buf/buf0rea.c:
  Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.

libmysqld/Makefile.am:
  Always use 'make' variable '$(AR)' so that options (AIX 64 bit!) are included.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysys/my_lib.c:
  Same fix for bug #4737 that wrongly I did first on tree 4.1
mysys/my_vsnprintf.c:
  Fix VC++ warning assuming that my_vsnprintf() is external
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

mysql-test/r/func_set.result:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators
mysql-test/t/func_set.test:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators
sql/item_func.cc:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators

   modifying configure.in for the commercial tarballs
 - added my-innodb-heavy-4G.cnf to the distribution


Build-tools/mysql-copyright:
   - make sure to recreate all autoconf/automake-related files after
     modifying configure.in
support-files/Makefile.am:
   - added my-innodb-heavy-4G.cnf to the distribution

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

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

wrong results