summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-10-08 11:52:39 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-10-08 11:52:39 -0300
commit31e1b12eb0fb67d3d65973fb1cd574be64373e04 (patch)
treecc80459f380661dd80e57ffaafccba0ef5662d77 /sql/mysqld.cc
parentc57244fb174e68be30c67cb807045f9512b5aa68 (diff)
downloadmariadb-git-31e1b12eb0fb67d3d65973fb1cd574be64373e04.tar.gz
Bug#45288: pb2 returns a lot of compilation warnings on linux
Fix assorted compiler warnings.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e489d466d5f..99754e8b7f6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3244,12 +3244,11 @@ static int init_common_variables()
desired page sizes.
*/
int nelem;
- int max_desired_page_size;
- int max_page_size;
+ size_t max_desired_page_size;
if (opt_super_large_pages)
- max_page_size= SUPER_LARGE_PAGESIZE;
+ max_desired_page_size= SUPER_LARGE_PAGESIZE;
else
- max_page_size= LARGE_PAGESIZE;
+ max_desired_page_size= LARGE_PAGESIZE;
nelem = getpagesizes(NULL, 0);
if (nelem > 0)
{