diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-07-04 17:27:46 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-07-04 17:27:46 +0300 |
| commit | c9e969b62dc81356ebc39e2e3c682ae7772a788a (patch) | |
| tree | 4ca67cd57acac3e26954a157a6144e156e7664d6 /storage/maria/ma_create.c | |
| parent | ec3c26a515ba5f52db28cfb06deba664fc61b7b5 (diff) | |
| parent | 7199ac591669a386f62c623e26071452ad3dd52b (diff) | |
| download | mariadb-git-c9e969b62dc81356ebc39e2e3c682ae7772a788a.tar.gz | |
Automatic merge
Diffstat (limited to 'storage/maria/ma_create.c')
| -rw-r--r-- | storage/maria/ma_create.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 6737030cd89..6b13f4eef4d 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -685,7 +685,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, share.state.dellink = HA_OFFSET_ERROR; share.state.first_bitmap_with_space= 0; -#ifdef EXTERNAL_LOCKING +#ifdef MARIA_EXTERNAL_LOCKING share.state.process= (ulong) getpid(); #endif share.state.version= (ulong) time((time_t*) 0); |