From a2e63487e8e9352ce64ef14be6ac203854eb570a Mon Sep 17 00:00:00 2001 From: "acurtis/antony@xiphis.org/ltamd64.xiphis.org" <> Date: Mon, 30 Apr 2007 17:46:05 -0700 Subject: [PATCH] strict compilers do not permit auto casting 'longlong *' to 'long long *' --- storage/innobase/handler/ha_innodb.cc | 2 +- storage/innobase/handler/ha_innodb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index a81cb748ce8..659576a8fad 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -102,7 +102,7 @@ long innobase_mirrored_log_groups, innobase_log_files_in_group, innobase_lock_wait_timeout, innobase_force_recovery, innobase_open_files; -longlong innobase_buffer_pool_size, innobase_log_file_size; +long long innobase_buffer_pool_size, innobase_log_file_size; /* The default values for the following char* start-up parameters are determined in innobase_init below: */ diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index e26298c1a28..90fc7727044 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -191,7 +191,7 @@ class ha_innobase: public handler }; extern long innobase_mirrored_log_groups, innobase_log_files_in_group; -extern longlong innobase_buffer_pool_size, innobase_log_file_size; +extern long long innobase_buffer_pool_size, innobase_log_file_size; extern long innobase_log_buffer_size; extern long innobase_additional_mem_pool_size; extern long innobase_buffer_pool_awe_mem_mb;