diff options
| author | monty@mysql.com <> | 2004-05-24 14:42:34 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-24 14:42:34 +0300 |
| commit | 56c02585360c4dde0ced5792de2127f198640cea (patch) | |
| tree | 14b4172c5a85ae390a88a1f2da65454dd65a0218 /innobase/include | |
| parent | a4b0ec1eded00350f41b26c475f45fe4919924c9 (diff) | |
| download | mariadb-git-56c02585360c4dde0ced5792de2127f198640cea.tar.gz | |
After merge fixes
Remove compiler warnings
Update windows project files
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/data0data.ic | 2 | ||||
| -rw-r--r-- | innobase/include/mem0pool.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/innobase/include/data0data.ic b/innobase/include/data0data.ic index 569bf898801..0769372e16f 100644 --- a/innobase/include/data0data.ic +++ b/innobase/include/data0data.ic @@ -98,7 +98,7 @@ dfield_set_data( { ut_ad(field); - field->data = data; + field->data = (void*) data; field->len = len; } diff --git a/innobase/include/mem0pool.h b/innobase/include/mem0pool.h index 08327d95d37..95cf19676fb 100644 --- a/innobase/include/mem0pool.h +++ b/innobase/include/mem0pool.h @@ -19,8 +19,6 @@ typedef struct mem_pool_struct mem_pool_t; /* The common memory pool */ extern mem_pool_t* mem_comm_pool; -extern ulint mem_out_of_mem_err_msg_count; - /* Memory area header */ struct mem_area_struct{ |