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

  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.

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

 - tagged ChangeSet@1.2013 as "mysql-4.1.4"

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

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1

discarded using of uint in cmd-line-utils/libedit/chared.c
because it's undefined on qnx

(non gcc compilers don't understand '-Dx()=' option)

Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files

into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

not variables.

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)

into serg.mylan:/usr/home/serg/Abk/mysql-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

cleanups
better, charset-dependent, ft_max_len_for_sort value

  Ascii was written twice

  Fixed missing * in comment in setup_windows_event_source

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

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.

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

into mysql.com:/home/jonas/src/mysql-4.1