diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-13 11:06:18 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-13 19:09:46 +0300 |
| commit | 497c6add88edae9c7ec6d6d840c0ed65adc016be (patch) | |
| tree | 92eb05976137821fcdf0caf556495a5b55436db0 /include | |
| parent | d8d725101992d50b00edf149e7ccd7f720b850dc (diff) | |
| parent | a48aa0cd569eda88bef98ed4abe41b0b570fcd51 (diff) | |
| download | mariadb-git-497c6add88edae9c7ec6d6d840c0ed65adc016be.tar.gz | |
System Versioning pre1.0
Merge branch '10.3' into trunk
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_alloc.h | 1 | ||||
| -rw-r--r-- | include/mysql.h.pp | 1 | ||||
| -rw-r--r-- | include/source_revision.h.in | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/my_alloc.h b/include/my_alloc.h index 85ac75fc666..b461065eb7c 100644 --- a/include/my_alloc.h +++ b/include/my_alloc.h @@ -43,6 +43,7 @@ typedef struct st_mem_root /* if block have less memory it will be put in 'used' list */ size_t min_malloc; size_t block_size; /* initial block size */ + size_t total_alloc; unsigned int block_num; /* allocated blocks counter */ /* first free block in queue test counter (if it exceed diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 4a196b3c772..b87316946a4 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -238,6 +238,7 @@ typedef struct st_mem_root USED_MEM *pre_alloc; size_t min_malloc; size_t block_size; + size_t total_alloc; unsigned int block_num; unsigned int first_block_usage; void (*error_handler)(void); diff --git a/include/source_revision.h.in b/include/source_revision.h.in index 5b657d0940e..991df992e2f 100644 --- a/include/source_revision.h.in +++ b/include/source_revision.h.in @@ -1 +1 @@ -#cmakedefine SOURCE_REVISION "@SOURCE_REVISION@" +#define SOURCE_REVISION "@SOURCE_REVISION@" |