diff options
author | Michael Widenius <monty@mysql.com> | 2010-11-30 01:27:14 +0200 |
---|---|---|
committer | Michael Widenius <monty@mysql.com> | 2010-11-30 01:27:14 +0200 |
commit | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (patch) | |
tree | 8d6392c56d26a7b695359d1a974b3093dd5b3467 /storage/heap | |
parent | b9589e2ed717b60152428f743f11e9063cae3e02 (diff) | |
download | mariadb-git-ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b.tar.gz |
Fixed some compiler warnings found when compiling for windows.
Changed rows_read and rows_sent status variables to be longlong (to avoid compiler warnings)
sql/item_func.cc:
Fixed wrong usage of alias
sql/item_subselect.cc:
Changed buffer size to ulonglong to be able detect buffers bigger than size_t
sql/item_subselect.h:
Changed buffer size to ulonglong to be able detect buffers bigger than size_t
sql/multi_range_read.cc:
Fixed compiler warning by using correct type for function argument
sql/mysqld.cc:
Changed rows_read and rows_sent status variables to be longlong
sql/opt_subselect.h:
Fixed compiler warning by using correct type for function argument
sql/sql_class.cc:
Changed rows_read and rows_sent status variables to be longlong
sql/sql_class.h:
Changed rows_read and rows_sent status variables to be longlong
Changed max_nulls_in_row to uint as this is number of columns in row.
This fixed some compiler warnings.
sql/sql_select.cc:
Added casts to avoid compiler warnings
storage/heap/ha_heap.cc:
Initilize different types separate
storage/oqgraph/ha_oqgraph.cc:
Fixed argument to store(longlong) to avoid compiler warnings
Diffstat (limited to 'storage/heap')
-rw-r--r-- | storage/heap/ha_heap.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 20d01c62b31..2d2c23a2ed6 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -695,7 +695,10 @@ int ha_heap::create(const char *name, TABLE *table_arg, (uchar*) table_arg->record[0]); } else - seg->bit_length= seg->bit_start= seg->bit_pos= 0; + { + seg->bit_length= seg->bit_start= 0; + seg->bit_pos= 0; + } } } mem_per_row+= MY_ALIGN(share->reclength + 1, sizeof(char*)); |