diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-27 10:48:41 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-27 10:48:41 +0100 |
| commit | 277d5db58f03f8489598da3f8d4e1e1fd224e6a3 (patch) | |
| tree | 292ef18ec2fc77c56bf281449e3b6b4060929dff /mysys/my_mmap.c | |
| parent | 07da228592ffd33e2d39e6c935e6babeeef95b25 (diff) | |
| parent | c4bdfc7bb02c3ae6ab4fa2609858e2a31186ce07 (diff) | |
| download | mariadb-git-277d5db58f03f8489598da3f8d4e1e1fd224e6a3.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-CMakeLists.txt~14:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
client/mysql_upgrade.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/my_mmap.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/udf_example.c:
Auto merged
support-files/mysql.spec.sh:
Use local
client/Makefile.am:
Manual merge
include/my_sys.h:
Manual merge
Diffstat (limited to 'mysys/my_mmap.c')
| -rw-r--r-- | mysys/my_mmap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c index 19d9541a967..79030c0a695 100644 --- a/mysys/my_mmap.c +++ b/mysys/my_mmap.c @@ -33,13 +33,6 @@ int my_msync(int fd, void *addr, size_t len, int flags) static SECURITY_ATTRIBUTES mmap_security_attributes= {sizeof(SECURITY_ATTRIBUTES), 0, TRUE}; -int my_getpagesize(void) -{ - SYSTEM_INFO si; - GetSystemInfo(&si); - return si.dwPageSize; -} - void *my_mmap(void *addr, size_t len, int prot, int flags, int fd, my_off_t offset) { |