into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

mysql_fix_privilege_tables.sql, or they may get truncated during conversion
to utf8. (Bug #7539)       


scripts/mysql_fix_privilege_tables.sql:
  Reset widths of all text fields at the same time as vonersion to utf8 to avoid length changes

into mysql.com:/home/jwinstead2/mysql-4.1-clean


scripts/mysql_config.sh:
  Auto merged

into mysql.com:/home/jwinstead2/mysql-4.1-clean

scripts/mysql_config.sh:
  Add comment to clarify why we can safely only strip flags with a leading space

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

client/mysqldump.c:
  fixed comment
  fixed compiler warning

client/mysqldump.c:
  fixed comparation with string constant on some platform

into mysql.com:/home/jwinstead2/mysql-4.1-clean


client/mysqladmin.cc:
  Auto merged

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

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

BUILD/compile-dist:
  - manual merge
include/my_pthread.h:
  - manual merge

   build (to make the test suite pass)


BUILD/compile-dist:
  - enable "with-extra-charsets=complex" for the distribution build
    (to make the test suite pass)

  Use the fcntl() file flush method on OS X; Apple disabled fsync() for internal disk drives, which caused corruption in power outages; the patch was recommended by an Apple engineer


innobase/os/os0file.c:
  Use the fcntl() file flush method on OS X; Apple disabled fsync() for internal disk drives, which caused corruption in power outages; the patch was recommended by an Apple engineer

client/mysqladmin.cc:
  Handle default-character-set being specified

talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)


client/mysqladmin.cc:
  Check old_passwords from server, and use that to determine
  which scramble function to use (except in the case of the
  old-password command, which always use the old scramble function).

include/my_pthread.h:
  fix merge conflict

official binary builds for Linux that are built against a static glibc with
a 128k thread stack size limit can be compiled with a default that doesn't
result in a harmless (but oft-misunderstood) warning message. (Bug #6226)


include/my_pthread.h:
  Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=...

  On Windows my_sleep() always gave a zero microsecond sleep


mysys/my_sleep.c:
  On Windows my_sleep() always gave a zero microsecond sleep

fixed bug

mysql-test/mysql_test_run_new.c:
  SCCS merged

_stricmp was replaved on sting_compare_func
added breakes for windows


mysql-test/mysql_test_run_new.c:
  _stricmp was replaved on sting_compare_func
  added breakes for windows

(Second commit of this patch -- first included wrong changes.)


scripts/mysql_config.sh:
  Make sure we are only removing whole options (protects -Wl,-O2, for example)

scripts/mysql_config.sh:
  include ZLIB_LIBS in --libs_r

to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249)


scripts/mysqld_safe.sh:
  Don't actually verify that datadir exists when
  using relatively-located mysqld -- just assume
  that it does and either let it fail when it
  doesn't, or do the right thing when datadir
  is then set via the command line or my.cnf file.

  Link mysql_test_run_new as console application
my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysqldump.dsp:
  Added mysys.lib for linking mysqldump


VC++Files/client/mysqldump.dsp:
  Added mysys.lib for linking mysqldump
VC++Files/client/mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysql-test/mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysql-test/my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Link mysql_test_run_new as console application

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

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

sql/set_var.cc:
  merge

  Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.


sql-common/client.c:
  Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.

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

sql/set_var.cc:
  Make query_cache_wlock_invalidate visible in SHOW VARIABLES

for port and/or pid-file parameters. (Bug #5878)


scripts/mysqld_safe.sh:
  Change 'ps xa' to 'ps xaww' so whole command-line is examined

sql-bench/crash-me.sh:
  Fix typo

into mysql.com:/space/my/mysql-4.1-build


Build-tools/Bootstrap:
  Auto merged