diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-07-19 14:25:52 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-07-19 14:25:52 +0200 |
| commit | d7b1a5f2a176e9be1789537d95b0efce5e4b770b (patch) | |
| tree | da96d8cd25bc39946abeae9f9373797de6f0958e /mysql-test/include | |
| parent | 93a56475e1aea0c0ea4a2443f5fb0e43d77643c6 (diff) | |
| download | mariadb-git-d7b1a5f2a176e9be1789537d95b0efce5e4b770b.tar.gz | |
Update 'abort_not_supported_test' to print a reason why the test was aborted
and use it in mysql-test-run.pl
Use standard defines as last argument to 'fn_format'
mysql-test/r/not_ndb_default.require:
Rename: mysql-test/r/true.require -> mysql-test/r/not_ndb_default.require
client/mysqltest.c:
Use proper defines for last argument to fn_format(they are defined in my_sys.h)
Make abort_not_supported_test print info about in what file the test was
aborted and a reason for it. The reason is a best guess, using the filename of
the .require file to format it.
mysql-test/include/not_ndb_default.inc:
Use a more descriptive name of the .require file
mysql-test/include/not_windows.inc:
Use a more descriptive name of the .require file
mysql-test/include/windows.inc:
Use a more descriptive name of the .require file
mysql-test/lib/mtr_io.pl:
Add new function 'mtr_lastlinefromfile' that will return only the last line of a file.
mysql-test/mysql-test-run.pl:
Get reason why mysqltest decided to abort testcase from mysqltest.log
mysql-test/r/not_windows.require:
New BitKeeper file ``mysql-test/r/not_windows.require''
mysql-test/r/windows.require:
New BitKeeper file ``mysql-test/r/windows.require''
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/not_ndb_default.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/not_windows.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/windows.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/include/not_ndb_default.inc b/mysql-test/include/not_ndb_default.inc index 1c148732a47..ca3c57a671a 100644 --- a/mysql-test/include/not_ndb_default.inc +++ b/mysql-test/include/not_ndb_default.inc @@ -1,4 +1,4 @@ ---require r/true.require +--require r/not_ndb_default.require disable_query_log; select convert(@@table_type using latin1) NOT IN ("ndbcluster","NDBCLUSTER") as "TRUE"; enable_query_log; diff --git a/mysql-test/include/not_windows.inc b/mysql-test/include/not_windows.inc index 54e9e0e817a..9240271077a 100644 --- a/mysql-test/include/not_windows.inc +++ b/mysql-test/include/not_windows.inc @@ -1,4 +1,4 @@ ---require r/true.require +--require r/not_windows.require disable_query_log; select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE"; enable_query_log; diff --git a/mysql-test/include/windows.inc b/mysql-test/include/windows.inc index 05ec7b0e021..3d64efbafc7 100644 --- a/mysql-test/include/windows.inc +++ b/mysql-test/include/windows.inc @@ -1,4 +1,4 @@ ---require r/true.require +--require r/windows.require disable_query_log; select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE"; enable_query_log; |