| List: | Commits | « Previous MessageNext Message » | |
| From: | kent | Date: | December 21 2005 2:29am |
| Subject: | bk commit into 5.1 tree (kent:1.1971) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of kent. When kent does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.1971 05/12/21 02:28:56 kent@stripped +3 -0 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 mysql-test/mysql-test-run.pl 1.47 05/12/21 02:28:19 kent@stripped +15 -8 Don't run "mysqlslap" on Windows mysql-test/t/mysqlslap.test 1.3 05/12/20 00:14:47 kent@stripped +1 -0 We don't run "mysqlslap" on Windows VC++Files/mysql.sln 1.9 05/12/20 00:05:50 kent@stripped +0 -39 Removed build of "client/mysqlslap.c" on Windows # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: kent # Host: c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se # Root: /Users/kent/mysql/bk/mysql-5.1-new --- 1.8/VC++Files/mysql.sln 2005-12-18 20:16:19 +01:00 +++ 1.9/VC++Files/mysql.sln 2005-12-20 00:05:50 +01:00 @@ -172,14 +172,6 @@ {44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF} EndProjectSection 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}" ProjectSection(ProjectDependencies) = postProject {DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98} @@ -964,37 +956,6 @@ {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.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.Build.0 = Release|Win32 {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic nt.ActiveCfg = Release|Win32 --- 1.46/mysql-test/mysql-test-run.pl 2005-12-19 03:48:56 +01:00 +++ 1.47/mysql-test/mysql-test-run.pl 2005-12-21 02:28:19 +01:00 @@ -936,6 +936,7 @@ { $path_client_bindir= mtr_path_exists("$glob_basedir/client"); $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_charsetsdir= mtr_path_exists("$glob_basedir/sql/share/charsets"); @@ -962,7 +963,6 @@ } $exe_mysqlcheck= mtr_exe_exists("$path_client_bindir/mysqlcheck"); $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_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow"); $exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog"); @@ -979,7 +979,6 @@ $exe_mysqlcheck= mtr_exe_exists("$path_client_bindir/mysqlcheck"); $exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump"); $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_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog"); $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); @@ -1005,6 +1004,7 @@ { $exe_mysqld= mtr_exe_exists ("$glob_basedir/libexec/mysqld", "$glob_basedir/bin/mysqld"); + $exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap"); } $exe_im= mtr_exe_exists("$glob_basedir/libexec/mysqlmanager", "$glob_basedir/bin/mysqlmanager"); @@ -2490,14 +2490,21 @@ $cmdline_mysqldump .= " --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'} " . "--socket=$master->[0]->{'path_mysock'} --password="; - if ( $opt_debug ) - { - $cmdline_mysqlslap .= - " --debug=d:t:A,$opt_vardir/log/mysqldump.trace"; + if ( $opt_debug ) + { + $cmdline_mysqlslap .= + " --debug=d:t:A,$opt_vardir/log/mysqldump.trace"; + } } + my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " . "--port=$master->[0]->{'path_myport'} " . "--socket=$master->[0]->{'path_mysock'} --password="; @@ -2559,7 +2566,7 @@ $ENV{'MYSQL'}= $cmdline_mysql; $ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck; $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_SHOW'}= $cmdline_mysqlshow; $ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog; --- 1.2/mysql-test/t/mysqlslap.test 2005-12-05 16:49:52 +01:00 +++ 1.3/mysql-test/t/mysqlslap.test 2005-12-20 00:14:47 +01:00 @@ -1,5 +1,6 @@ # Can't run test of external client with embedded server --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
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (kent:1.1971) | kent | 21 Dec |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.063 sec. using MySQL 5.1.14-beta-log