summaryrefslogtreecommitdiff
path: root/storage/innobase/os
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-06-13 14:09:09 +0200
committerunknown <joreland@mysql.com>2005-06-13 14:09:09 +0200
commita52035d1dea1592b846cea6b61d179ac2498cc0d (patch)
tree7e3f66a702511215287651c2b4df1c301c2f0c8a /storage/innobase/os
parenta02db7617981d32633812a9279b4092029230cad (diff)
parentfd34694dc840993537692c10207c8a9d571cf515 (diff)
downloadmariadb-git-a52035d1dea1592b846cea6b61d179ac2498cc0d.tar.gz
merge
BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/bdb/dist/configure.ac: Auto merged storage/innobase/os/os0file.c: Auto merged storage/innobase/os/os0sync.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/ndb/src/common/logger/Logger.cpp: Auto merged storage/ndb/src/cw/cpcd/main.cpp: Auto merged storage/ndb/test/ndbapi/testBlobs.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged
Diffstat (limited to 'storage/innobase/os')
-rw-r--r--storage/innobase/os/os0file.c18
-rw-r--r--storage/innobase/os/os0sync.c6
2 files changed, 12 insertions, 12 deletions
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
index 9df26150160..ac5d1c72c72 100644
--- a/storage/innobase/os/os0file.c
+++ b/storage/innobase/os/os0file.c
@@ -605,7 +605,7 @@ os_file_opendir(
lpFindFileData = ut_malloc(sizeof(WIN32_FIND_DATA));
- dir = FindFirstFile(path, lpFindFileData);
+ dir = FindFirstFile((LPCTSTR) path, lpFindFileData);
ut_free(lpFindFileData);
@@ -686,15 +686,15 @@ next_file:
ret = FindNextFile(dir, lpFindFileData);
if (ret) {
- ut_a(strlen(lpFindFileData->cFileName) < OS_FILE_MAX_PATH);
+ ut_a(strlen((char *) lpFindFileData->cFileName) < OS_FILE_MAX_PATH);
- if (strcmp(lpFindFileData->cFileName, ".") == 0
- || strcmp(lpFindFileData->cFileName, "..") == 0) {
+ if (strcmp((char *) lpFindFileData->cFileName, ".") == 0
+ || strcmp((char *) lpFindFileData->cFileName, "..") == 0) {
goto next_file;
}
- strcpy(info->name, lpFindFileData->cFileName);
+ strcpy(info->name, (char *) lpFindFileData->cFileName);
info->size = (ib_longlong)(lpFindFileData->nFileSizeLow)
+ (((ib_longlong)(lpFindFileData->nFileSizeHigh)) << 32);
@@ -830,7 +830,7 @@ os_file_create_directory(
#ifdef __WIN__
BOOL rcode;
- rcode = CreateDirectory(pathname, NULL);
+ rcode = CreateDirectory((LPCTSTR) pathname, NULL);
if (!(rcode != 0 ||
(GetLastError() == ERROR_ALREADY_EXISTS && !fail_if_exists))) {
/* failure */
@@ -914,7 +914,7 @@ try_again:
ut_error;
}
- file = CreateFile(name,
+ file = CreateFile((LPCTSTR) name,
access,
FILE_SHARE_READ | FILE_SHARE_WRITE,
/* file can be read ansd written also
@@ -1053,7 +1053,7 @@ os_file_create_simple_no_error_handling(
ut_error;
}
- file = CreateFile(name,
+ file = CreateFile((LPCTSTR) name,
access,
share_mode,
NULL, /* default security attributes */
@@ -1200,7 +1200,7 @@ try_again:
ut_error;
}
- file = CreateFile(name,
+ file = CreateFile((LPCTSTR) name,
GENERIC_READ | GENERIC_WRITE, /* read and write
access */
share_mode, /* File can be read also by other
diff --git a/storage/innobase/os/os0sync.c b/storage/innobase/os/os0sync.c
index 18d92af5054..356d7c8c163 100644
--- a/storage/innobase/os/os0sync.c
+++ b/storage/innobase/os/os0sync.c
@@ -121,7 +121,7 @@ os_event_create(
event->handle = CreateEvent(NULL,/* No security attributes */
TRUE, /* Manual reset */
FALSE, /* Initial state nonsignaled */
- name);
+ (LPCTSTR) name);
if (!event->handle) {
fprintf(stderr,
"InnoDB: Could not create a Windows event semaphore; Windows error %lu\n",
@@ -177,7 +177,7 @@ os_event_create_auto(
event->handle = CreateEvent(NULL,/* No security attributes */
FALSE, /* Auto-reset */
FALSE, /* Initial state nonsignaled */
- name);
+ (LPCTSTR) name);
if (!event->handle) {
fprintf(stderr,
@@ -440,7 +440,7 @@ os_mutex_create(
mutex = CreateMutex(NULL, /* No security attributes */
FALSE, /* Initial state: no owner */
- name);
+ (LPCTSTR) name);
ut_a(mutex);
#else
os_fast_mutex_t* mutex;