summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorInaam Rana <inaam.rana@oracle.com>2010-07-30 10:41:59 -0400
committerInaam Rana <inaam.rana@oracle.com>2010-07-30 10:41:59 -0400
commite3e0c290dd47f74dc4f2a1885dd22d8fe1ee38f8 (patch)
treea81920828de32c3c9a8d4f04443ce5a6487ea541 /storage/innobase
parent0f9c818545946dbee97bc7a8ff80ce09ed7e7cd1 (diff)
parentca090321bf72a107e1ae1e55a5693a4511edc36e (diff)
downloadmariadb-git-e3e0c290dd47f74dc4f2a1885dd22d8fe1ee38f8.tar.gz
merge from parent
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/handler/ha_innodb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 8778c705d5a..ab9df9a0272 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1256,7 +1256,7 @@ innobase_mysql_tmpfile(void)
my_close(). */
#ifdef _WIN32
- /* Note that on Windows, the integer returned by mysql_tmpfile
+ /* Note that on Windows, the integer returned by mysql_tmpfile
has no relation to C runtime file descriptor. Here, we need
to call my_get_osfhandle to get the HANDLE and then convert it
to C runtime filedescriptor. */