mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
c4d0901d00
crashes. MySQL distributions contain a number of programs that are used only by the MySQL test suite internally, i.e. they are not indended to be invoked directly by a user. As a result, such programs are not documented, do not have any built-in help or proper error reporting, which may confuse users. This patch fixes the problem with the following changes: - mytest, libmysqltest and all references to them were removed from the distribution since they are not used anymore - bug25714 now displays an error message when run with incorrect arguments or with the --help option - mysql_client_test now does not call abort() in case of errors, instead it does a clean exit() with a proper error status. BitKeeper/deleted/.del-mytest.c: Delete: libmysql/mytest.c BitKeeper/deleted/.del-myTest-package.dsp: Delete: VC++Files/libmysqltest/myTest-package.dsp BitKeeper/deleted/.del-myTest-package_ia64.dsp: Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952: Delete: VC++Files/libmysqltest/myTest.dsp BitKeeper/deleted/.del-myTest.vcproj: Delete: VC++Files/libmysqltest/myTest.vcproj BitKeeper/deleted/.del-myTest_ia64.dsp: Delete: VC++Files/libmysqltest/myTest_ia64.dsp BitKeeper/deleted/.del-mytest.c~9a99338689e5de8: Delete: VC++Files/libmysqltest/mytest.c BitKeeper/deleted/.del-mytest.dsw~2324698861155335: Delete: VC++Files/libmysqltest/mytest.dsw VC++Files/copy_mysql_files.bat: Removed references to libmysqltest. libmysql/CMakeLists.txt: Removed rules for myTest. libmysql/Makefile.am: Removed mytest.c from EXTRA_DIST. tests/bug25714.c: Display a meaningful error message when run incorrectly or with the --help option. tests/mysql_client_test.c: In case of error, don't cause abnormal program termination, do a clean exit() with an error status.
92 lines
2.6 KiB
Batchfile
92 lines
2.6 KiB
Batchfile
REM stop any conflicting service
|
|
|
|
@echo off
|
|
REM Copyright (C) 2004 MySQL AB
|
|
REM
|
|
REM This program is free software; you can redistribute it and/or modify
|
|
REM it under the terms of the GNU General Public License as published by
|
|
REM the Free Software Foundation; version 2 of the License.
|
|
REM
|
|
REM This program is distributed in the hope that it will be useful,
|
|
REM but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
REM GNU General Public License for more details.
|
|
REM
|
|
REM You should have received a copy of the GNU General Public License
|
|
REM along with this program; if not, write to the Free Software
|
|
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
@echo on
|
|
|
|
net stop mysql
|
|
|
|
REM Copy binaries to c:\mysql
|
|
REM (We assume we are in build root when executing this script)
|
|
|
|
copy lib_debug\libmysql.* c:\mysql\lib\debug
|
|
copy lib_debug\zlib.* c:\mysql\lib\debug
|
|
copy lib_debug\mysqlclient.lib c:\mysql\lib\debug
|
|
|
|
copy lib_release\mysqlclient.lib c:\mysql\lib\opt
|
|
copy lib_release\libmysql.* c:\mysql\lib\opt
|
|
copy lib_release\zlib.* c:\mysql\lib\opt
|
|
|
|
IF "%1"=="classic" goto CLASSIC
|
|
IF "%1"=="pro" goto PRO
|
|
|
|
REM GPL binaries
|
|
|
|
copy client_release\*.exe c:\mysql\bin
|
|
copy client_debug\mysqld.exe c:\mysql\bin
|
|
|
|
goto REST
|
|
|
|
:CLASSIC
|
|
REM Classic binaries
|
|
|
|
copy client_release\*.exe c:\mysql\bin
|
|
copy client_classic\*.exe c:\mysql\bin
|
|
copy client_debug\mysqld.exe c:\mysql\bin\mysqld-debug.exe
|
|
copy lib_classic\*.* c:\mysql\lib\opt
|
|
|
|
goto REST
|
|
|
|
:PRO
|
|
REM Pro binaries
|
|
|
|
copy client_release\*.exe c:\mysql\bin
|
|
copy client_classic\*.exe c:\mysql\bin
|
|
copy client_pro\*.exe c:\mysql\bin
|
|
copy client_debug\mysqld.exe c:\mysql\bin\mysqld-debug.exe
|
|
copy lib_pro\*.* c:\mysql\lib\opt
|
|
|
|
:REST
|
|
|
|
REM
|
|
REM Copy include files
|
|
REM
|
|
|
|
copy include\mysql*.h c:\mysql\include
|
|
copy include\errmsg.h c:\mysql\include
|
|
copy include\my_sys.h c:\mysql\include
|
|
copy include\my_list.h c:\mysql\include
|
|
copy include\my_pthread.h c:\mysql\include
|
|
copy include\my_dbug.h c:\mysql\include
|
|
copy include\m_string.h c:\mysql\include
|
|
copy include\m_ctype.h c:\mysql\include
|
|
copy include\raid.h c:\mysql\include
|
|
copy include\conf*.h c:\mysql\include
|
|
copy include\my_global.h c:\mysql\include\my_global.h
|
|
copy libmysql\libmysql.def c:\mysql\include
|
|
|
|
REM Copy share, docs etc
|
|
|
|
xcopy share\*.* c:\mysql\share /E /Y
|
|
xcopy scripts\*.* c:\mysql\scripts /E /Y
|
|
xcopy docs\*.* c:\mysql\docs /E /Y
|
|
xcopy sql-bench\*.* c:\mysql\bench /E /Y
|
|
copy docs\readme c:\mysql\
|
|
|
|
REM Copy privilege tables (Delete old ones as they may be from a newer version)
|
|
|
|
del c:\mysql\data\mysql\*.* /Q
|
|
xcopy data\mysql\*.* c:\mysql\data\mysql /E /Y
|