diff options
| author | unknown <msvensson@shellback.(none)> | 2006-04-06 11:38:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-04-06 11:38:50 +0200 |
| commit | 84c13fdf922e0a4c46d3bab3d142b509fd4d105e (patch) | |
| tree | f8c5ea9f052570e50c6bdf8fb581fd7c7a8148e8 /include | |
| parent | ee75eaa3c734183b20cef33e7dd8802680e1b845 (diff) | |
| parent | 3e2cf7664060a7dd1ef9157e26370b44f81b7bd6 (diff) | |
| download | mariadb-git-84c13fdf922e0a4c46d3bab3d142b509fd4d105e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into shellback.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/m_ctype.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
storage/csv/ha_tina.cc:
SCCS merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 2df8dbc9e89..26bf31ae10d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -850,6 +850,7 @@ my_bool my_gethwaddr(uchar *to); #define PROT_WRITE 2 #define MAP_NORESERVE 0 #define MAP_SHARED 0x0001 +#define MAP_PRIVATE 0x0002 #define MAP_NOSYNC 0x0800 #define MAP_FAILED ((void *)-1) #define MS_SYNC 0x0000 |