into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysql_upgrade.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
client/mysql_upgrade.c:
Send error messages to stderr
Add new define EXTRA_CLIENT_PATHS containing additional paths where
to look for the client binaries
Add new test file mysql_upgrade.test
BitKeeper/deleted/.del-abi_check.ic:
Rename: include/abi_check.ic -> BitKeeper/deleted/.del-abi_check.ic
client/mysql_upgrade.c:
Make mysql_upgrade search also in "client" dir so it can be run from a source dist.
mysql-test/mysql-test-run.pl:
Make it possible for .test scripts to run "mysql_upgrade"
mysql-test/r/mysql_upgrade.result:
New BitKeeper file ``mysql-test/r/mysql_upgrade.result''
mysql-test/t/mysql_upgrade.test:
New BitKeeper file ``mysql-test/t/mysql_upgrade.test''
the communication parameters from the command line
and pass 'em correctly to both mysqlcheck and mysql
client/mysql_upgrade.c:
Now mysql_upgrade passes all the parameters specified on
the command line to both mysqlcheck and mysql through
the upgrade_defaults file
We open for writing a known location, which is exploitable with a symlink
attack. Now, use the EXCLusive flag, so that the presence of anything at
that location causes a failure. Try once to open safely, and if failure
then remove that location and try again to open safely. If both fail, then
raise an error.
client/mysql_upgrade.c:
Open the file with the O_EXCL flag, so that a symlink attack would not work.
If opening it fails, try removing something at that location, and try again.
If the second time fails, then abort as previous.
on Windows.
Code added to look for different names on Windows
client/mysql_upgrade.c:
added conditionally-compiled part to look for different names of tools
on Windows
BitKeeper/etc/ignore:
Added client/mysql_upgrade to the ignore list
client/mysql_upgrade.c:
fixed for Win build
include/config-win.h:
fixed for Win build
