diff options
| author | unknown <jimw@mysql.com> | 2005-08-04 12:49:23 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-04 12:49:23 -0700 |
| commit | 1f0c2ab3fc2431baf2cbbcf2d42a206226a07730 (patch) | |
| tree | fc0ab4c64f0db1183511695134392ee58765eda9 /mysql-test/include | |
| parent | 2b41471429d9db41d64bfb214e29ba57cb3db381 (diff) | |
| parent | 1beb95e3e43c7ae56a75e9206fa2b904480d0604 (diff) | |
| download | mariadb-git-1f0c2ab3fc2431baf2cbbcf2d42a206226a07730.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
BitKeeper/deleted/.del-not_windows.inc:
Delete: mysql-test/include/not_windows.inc
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_flush_tables.test:
Auto merged
sql-common/my_time.c:
Auto merged
mysql-test/r/query_cache.result:
Resolve conflict
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/not_windows.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/not_windows.inc b/mysql-test/include/not_windows.inc index 0db231ddb81..54e9e0e817a 100644 --- a/mysql-test/include/not_windows.inc +++ b/mysql-test/include/not_windows.inc @@ -1,4 +1,4 @@ --require r/true.require ---disable_query_log; +disable_query_log; select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE"; ---enable_query_log; +enable_query_log; |