diff options
| author | unknown <jimw@mysql.com> | 2005-08-31 19:12:16 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-31 19:12:16 -0700 |
| commit | d1c80dd648ecfdea14af7332395facec2d0552a4 (patch) | |
| tree | d1f472d71ff75d1aa210d6a6e3c0a0ade588ac60 /mysql-test/include | |
| parent | bdddd8c089c05ac8e74ab4996c601175d52a5dc8 (diff) | |
| parent | 1b6fdf86f93c63b10841d16da5fd403302c259da (diff) | |
| download | mariadb-git-d1c80dd648ecfdea14af7332395facec2d0552a4.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
configure.in:
Auto merged
include/my_global.h:
Auto merged
myisam/mi_extra.c:
Auto merged
mysql-test/r/lowercase_table.result:
Auto merged
mysql-test/t/lowercase_table.test:
Auto merged
mysys/my_access.c:
Auto merged
BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
Auto merged
sql/examples/ha_tina.cc:
Resolve conflict
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/windows.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/windows.inc b/mysql-test/include/windows.inc new file mode 100644 index 00000000000..05ec7b0e021 --- /dev/null +++ b/mysql-test/include/windows.inc @@ -0,0 +1,4 @@ +--require r/true.require +disable_query_log; +select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE"; +enable_query_log; |