Commit graph

228 commits

Author SHA1 Message Date
msvensson@shellback.(none)
59e7e3810d Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
2006-03-13 11:13:58 +01:00
msvensson@shellback.(none)
2628ebe89f Remove printouts 2006-03-13 11:06:14 +01:00
msvensson@shellback.(none)
904e3ca2dc Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
2006-03-13 10:36:41 +01:00
msvensson@shellback.(none)
b32f1367fe Make mysql-test-run.pl restore the db(s) to a known state before continuing after test case failure 2006-03-13 10:30:36 +01:00
msvensson@shellback.(none)
64e9d98f4d Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
2006-03-07 20:45:44 +01:00
msvensson@shellback.(none)
773e6ddec5 Bug#17574 Detect cluster start failure and "fail" ndb_* tests
- Update for 5.1
2006-03-07 20:35:59 +01:00
msvensson@shellback.(none)
a3d9bb416d Merge shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
2006-03-07 20:03:01 +01:00
msvensson@shellback.(none)
87209d560c Bug#17574 Detect cluster start failure and "fail" ndb_* tests 2006-03-07 19:44:58 +01:00
kent@mysql.com
0aaded3707 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 18:21:38 +01:00
msvensson@neptunus.(none)
21cc7c9555 Windows fixes
- Use pipes "|"
 - Improved system command, create a temporary .sh faile that is executed  with cygwins sh(bash)
   This makes the Windows version behave exactly as the Lunix version(well almost...) 
 - Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
2006-03-03 14:55:05 +01:00
pem@mysql.com
015ab71a50 Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 12:03:27 +01:00
kent@mysql.com
550e73cc6e mysql-test-run.pl:
Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861
2006-03-02 22:53:38 +01:00
msvensson@shellback.(none)
371c986746 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-01 15:29:38 +01:00
tomas@poseidon.ndb.mysql.com
df6bb1994b Bug #17805 Cluster_replication database should be renamed to just cluster 2006-03-01 13:31:21 +01:00
joerg@mysql.com
30e00b0f7f Manual merge of the added "--comment=<string>" option
to both the Shell and the Perl vaerion of "mysql-test-run"-
2006-03-01 13:29:37 +01:00
joerg@mysql.com
38a7f5551a mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1). 2006-03-01 13:15:37 +01:00
msvensson@shellback.(none)
a79c6b60d2 Merge neptunus:mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 11:03:18 +01:00
dlenev@mysql.com
8dbdf5237e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
msvensson@neptunus.(none)
0d2e58c27c Trace mysqlslap to mysqlslap.trace 2006-02-26 23:39:14 +01:00
msvensson@neptunus.(none)
1b115976b6 Trace mysqlcheck to file mysqlcheck.trcae 2006-02-26 23:36:53 +01:00
msvensson@neptunus.(none)
90e5ca96be Look for and "convert" paths that start with $MYSQL_TMP_DIR 2006-02-26 19:54:09 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:41:37 +01:00
knielsen@mysql.com
da6e7e172f Merge mysqldev@win2003-x86:my/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-22 10:19:45 +01:00
msvensson@neptunus.(none)
8e760bc6cc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
kent@mysql.com
0120bac7f6 mysql-test-run.pl:
Added --restart-cleanup option
drop-on-restart.inc:
  DROP commands to cleanup on restart
  new file
mysqltest.c:
  Added option --include=<sql-file>
2006-02-20 00:32:07 +01:00
kent@mysql.com
bfdb5e585d mysql-test-run.pl:
Added --comment=<string> option
2006-02-17 16:20:53 +01:00
msvensson@neptunus.(none)
3a16e66cb2 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-17 12:24:21 +01:00
msvensson@neptunus.(none)
c8c579b2e5 Set opt_vardir_trace for path for tracefiles 2006-02-17 12:19:05 +01:00
msvensson@neptunus.(none)
01cd7a05c7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-17 12:16:36 +01:00
msvensson@neptunus.(none)
b951068d62 Replace win filename s with unix equivalent
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
2006-02-17 12:07:45 +01:00
msvensson@neptunus.(none)
0a531dcec9 Make sure slave cluster is stopped if there is cluster support 2006-02-14 09:15:51 +01:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
kent@mysql.com
73de951abc Merge 2006-02-12 04:48:52 +01:00
kent@mysql.com
f9a23667b2 Merge 2006-02-12 04:33:50 +01:00
kent@mysql.com
30b8a9c1fb spatial.cc:
Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0
2006-02-12 04:13:24 +01:00
kent@mysql.com
6595c64958 Merge 2006-02-11 23:59:21 +01:00
kent@mysql.com
c94b3638f1 Merge 2006-02-11 23:44:56 +01:00
kent@mysql.com
2619c54bd1 mysql-test-run.{pl,sh}:
Give space for second and third slave port
2006-02-11 23:35:23 +01:00
kent@mysql.com
40596fa00d Merge 2006-02-11 23:23:39 +01:00
kent@mysql.com
5fe2e8fd7d mysql-test-run.pl:
Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave
2006-02-10 19:56:34 +01:00
kent@mysql.com
f8e08f38fe Merge 2006-02-10 19:47:46 +01:00
knielsen@mysql.com
abcf6ccebb Changes to make testsuite run in CMake build tree. 2006-02-10 13:29:01 +01:00
msvensson@neptunus.(none)
d1a7592a8a Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-09 13:30:34 +01:00
msvensson@neptunus.(none)
63aca4de7b Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-09 10:35:47 +01:00
msvensson@neptunus.(none)
63f9b6ce43 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
2006-02-09 10:31:35 +01:00
msvensson@neptunus.(none)
35fc3dcc99 Force stop of old cluster 2006-02-09 10:25:14 +01:00
msvensson@neptunus.(none)
74af19958e Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-09 09:57:07 +01:00
msvensson@neptunus.(none)
c2df73e2c2 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
2006-02-09 09:46:56 +01:00
msvensson@neptunus.(none)
0e9e1f2c5d Start cluster only for testcases that really needs it and stop it when
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not 
need to be contacted for each table to be dropped or created.
Backport from 5.1
2006-02-09 09:40:48 +01:00