Skip to content

M
MariaDB
Commit 17f293fd authored by kent@mysql.com's avatar kent@mysql.com
Browse files
Options

mysql-test-run.pl: 

  Don't run "mysqlslap" on Windows
mysqlslap.test:
  We don't run "mysqlslap" on Windows
mysql.sln:
  Removed build of "client/mysqlslap.c" on Windows
parent 16bf0baf
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 47 deletions
VC++Files/mysql.sln
View file @ 17f293fd
...@@ -172,14 +172,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshow", "client\mysqlsh ...@@ -172,14 +172,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshow", "client\mysqlsh
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF} {44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshow", "client\mysqlslap.vcproj", "{3737BFE2-EF25-464F-994D-BD28A9F84529}"
ProjectSection(ProjectDependencies) = postProject
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yassl", "extra\yassl\yassl.vcproj", "{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yassl", "extra\yassl\yassl.vcproj", "{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98} {DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
...@@ -964,37 +956,6 @@ Global ...@@ -964,37 +956,6 @@ Global
{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS.Build.0 = Release|Win32 {3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.ActiveCfg = Debug|Win32 {3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.ActiveCfg = Debug|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.Build.0 = Debug|Win32 {3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.Build.0 = Debug|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic.ActiveCfg = classic|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic.Build.0 = classic|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic nt.ActiveCfg = classic|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic nt.Build.0 = classic|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Debug.ActiveCfg = Debug|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Debug.Build.0 = Debug|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Classic.ActiveCfg = classic|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Debug.ActiveCfg = Debug|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Pro.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_ProGPL.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Release.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max nt.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max nt.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.nt.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.nt.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl nt.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl nt.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro nt.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro nt.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Release.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.Release.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS.ActiveCfg = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS.Build.0 = Release|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS_DEBUG.ActiveCfg = Debug|Win32
{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS_DEBUG.Build.0 = Debug|Win32
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.ActiveCfg = Release|Win32 {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.ActiveCfg = Release|Win32
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.Build.0 = Release|Win32 {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.Build.0 = Release|Win32
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic nt.ActiveCfg = Release|Win32 {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic nt.ActiveCfg = Release|Win32
......
mysql-test/mysql-test-run.pl
View file @ 17f293fd
...@@ -936,6 +936,7 @@ sub executable_setup () { ...@@ -936,6 +936,7 @@ sub executable_setup () {
{ {
$path_client_bindir= mtr_path_exists("$glob_basedir/client"); $path_client_bindir= mtr_path_exists("$glob_basedir/client");
$exe_mysqld= mtr_exe_exists ("$glob_basedir/sql/mysqld"); $exe_mysqld= mtr_exe_exists ("$glob_basedir/sql/mysqld");
$exe_mysqlslap= mtr_exe_exists ("$path_client_bindir/mysqlslap");
$path_language= mtr_path_exists("$glob_basedir/sql/share/english/"); $path_language= mtr_path_exists("$glob_basedir/sql/share/english/");
$path_charsetsdir= mtr_path_exists("$glob_basedir/sql/share/charsets"); $path_charsetsdir= mtr_path_exists("$glob_basedir/sql/share/charsets");
...@@ -962,7 +963,6 @@ sub executable_setup () { ...@@ -962,7 +963,6 @@ sub executable_setup () {
} }
$exe_mysqlcheck= mtr_exe_exists("$path_client_bindir/mysqlcheck"); $exe_mysqlcheck= mtr_exe_exists("$path_client_bindir/mysqlcheck");
$exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump"); $exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump");
$exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap");
$exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport"); $exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport");
$exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow"); $exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow");
$exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog"); $exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog");
...@@ -979,7 +979,6 @@ sub executable_setup () { ...@@ -979,7 +979,6 @@ sub executable_setup () {
$exe_mysqlcheck= mtr_exe_exists("$path_client_bindir/mysqlcheck"); $exe_mysqlcheck= mtr_exe_exists("$path_client_bindir/mysqlcheck");
$exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump"); $exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump");
$exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport"); $exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport");
$exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap");
$exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow"); $exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow");
$exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog"); $exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog");
$exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin");
...@@ -1005,6 +1004,7 @@ sub executable_setup () { ...@@ -1005,6 +1004,7 @@ sub executable_setup () {
{ {
$exe_mysqld= mtr_exe_exists ("$glob_basedir/libexec/mysqld", $exe_mysqld= mtr_exe_exists ("$glob_basedir/libexec/mysqld",
"$glob_basedir/bin/mysqld"); "$glob_basedir/bin/mysqld");
$exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap");
} }
$exe_im= mtr_exe_exists("$glob_basedir/libexec/mysqlmanager", $exe_im= mtr_exe_exists("$glob_basedir/libexec/mysqlmanager",
"$glob_basedir/bin/mysqlmanager"); "$glob_basedir/bin/mysqlmanager");
...@@ -2490,14 +2490,21 @@ sub run_mysqltest ($) { ...@@ -2490,14 +2490,21 @@ sub run_mysqltest ($) {
$cmdline_mysqldump .= $cmdline_mysqldump .=
" --debug=d:t:A,$opt_vardir/log/mysqldump.trace"; " --debug=d:t:A,$opt_vardir/log/mysqldump.trace";
} }
my $cmdline_mysqlslap= "$exe_mysqlslap -uroot " .
my $cmdline_mysqlslap;
unless ( $glob_win32 )
{
$cmdline_mysqlslap= "$exe_mysqlslap -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'path_myport'} " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_mysock'} --password=";
if ( $opt_debug ) if ( $opt_debug )
{ {
$cmdline_mysqlslap .= $cmdline_mysqlslap .=
" --debug=d:t:A,$opt_vardir/log/mysqldump.trace"; " --debug=d:t:A,$opt_vardir/log/mysqldump.trace";
}
} }
my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " . my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'path_myport'} " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_mysock'} --password=";
...@@ -2559,7 +2566,7 @@ sub run_mysqltest ($) { ...@@ -2559,7 +2566,7 @@ sub run_mysqltest ($) {
$ENV{'MYSQL'}= $cmdline_mysql; $ENV{'MYSQL'}= $cmdline_mysql;
$ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck; $ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck;
$ENV{'MYSQL_DUMP'}= $cmdline_mysqldump; $ENV{'MYSQL_DUMP'}= $cmdline_mysqldump;
$ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap; $ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap unless $glob_win32;
$ENV{'MYSQL_IMPORT'}= $cmdline_mysqlimport; $ENV{'MYSQL_IMPORT'}= $cmdline_mysqlimport;
$ENV{'MYSQL_SHOW'}= $cmdline_mysqlshow; $ENV{'MYSQL_SHOW'}= $cmdline_mysqlshow;
$ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog; $ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog;
......
mysql-test/t/mysqlslap.test
View file @ 17f293fd
# Can't run test of external client with embedded server # Can't run test of external client with embedded server
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/not_windows.inc
--exec $MYSQL_SLAP --silent --drop-schema --concurrency=5 --concurrency-load=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --number-rows=12 --auto-generate-sql --exec $MYSQL_SLAP --silent --drop-schema --concurrency=5 --concurrency-load=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --number-rows=12 --auto-generate-sql
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7