diff options
| author | Michael Widenius <monty@mysql.com> | 2010-08-09 20:49:42 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-08-09 20:49:42 +0300 |
| commit | 7cf5100412e76516304359e7d6a2824bc6a57023 (patch) | |
| tree | cdd0610d1136997b29000e62591766ed9c168df3 /include | |
| parent | 3bb2045fe12fa4ee8af11b9ff38cee39e67de67a (diff) | |
| parent | 12648015b322e885923f87d919c07529423a0eca (diff) | |
| download | mariadb-git-7cf5100412e76516304359e7d6a2824bc6a57023.tar.gz | |
Merge with 5.2
Fixed some compiler errors regarding longlong2str()
strings/longlong2str.c:
Fixed usage of wrong variable
strings/longlong2str_asm.c:
Fixed wrong prototype
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 81917c48acd..f01a9a6d4a6 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -270,6 +270,7 @@ extern size_t sf_malloc_cur_memory, sf_malloc_max_memory; extern ulong my_default_record_cache_size; extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks; +extern my_bool my_disable_sync; extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; /* from default.c */ |