bk commit into maria tree (guilhem:1.2619)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
maria repository of guilhem.  When guilhem 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@stripped, 2008-03-04 17:07:55+01:00, guilhem@stripped +2 -0
  Making ma_pagecache_rwconsist_1k-t unit test build under Windows

  storage/maria/unittest/CMakeLists.txt@stripped, 2008-03-04 17:07:52+01:00,
guilhem@stripped +2 -0
    build unit test under Windows too

  storage/maria/unittest/ma_pagecache_rwconsist.c@stripped, 2008-03-04 17:07:52+01:00,
guilhem@stripped +1 -1
    portability fix for Windows

diff -Nrup a/storage/maria/unittest/CMakeLists.txt b/storage/maria/unittest/CMakeLists.txt
--- a/storage/maria/unittest/CMakeLists.txt	2008-02-13 23:35:06 +01:00
+++ b/storage/maria/unittest/CMakeLists.txt	2008-03-04 17:07:52 +01:00
@@ -93,3 +93,5 @@ SET_TARGET_PROPERTIES(ma_pagecache_consi
 ADD_EXECUTABLE(ma_pagecache_consist_64kWR-t ${ma_pagecache_consist_src})
 SET_TARGET_PROPERTIES(ma_pagecache_consist_64kWR-t
 	PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=65536
-DTEST_WRITERS")
+ADD_EXECUTABLE(ma_pagecache_rwconsist_1k-t ma_pagecache_rwconsist.c)
+SET_TARGET_PROPERTIES(ma_pagecache_rwconsist_1k-t PROPERTIES COMPILE_FLAGS
"-DTEST_PAGE_SIZE=1024")
diff -Nrup a/storage/maria/unittest/ma_pagecache_rwconsist.c
b/storage/maria/unittest/ma_pagecache_rwconsist.c
--- a/storage/maria/unittest/ma_pagecache_rwconsist.c	2008-03-04 12:58:18 +01:00
+++ b/storage/maria/unittest/ma_pagecache_rwconsist.c	2008-03-04 17:07:52 +01:00
@@ -31,7 +31,7 @@ static const char* default_dbug_option;
 #endif
 
 
-#define SLEEP usleep(5)
+#define SLEEP my_sleep(5)
 
 static char *file1_name= (char*)"page_cache_test_file_1";
 static PAGECACHE_FILE file1;