summaryrefslogtreecommitdiff
path: root/storage/csv
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-02-13 11:41:47 -0500
committerIgnacio Galarza <iggy@mysql.com>2009-02-13 11:41:47 -0500
commit5b7347bda31b9d66cd78937e5dc339f553b9a736 (patch)
tree85b39362efeae16536a90f3a3624acd6916d4305 /storage/csv
parent50b19265ffcf4e4708c86345a5c166c58dbdb523 (diff)
parent54fbbf9591e21cda9f7b26c2d795d88f51827f07 (diff)
downloadmariadb-git-5b7347bda31b9d66cd78937e5dc339f553b9a736.tar.gz
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
Diffstat (limited to 'storage/csv')
-rw-r--r--storage/csv/ha_tina.cc2
-rw-r--r--storage/csv/ha_tina.h2
-rw-r--r--storage/csv/transparent_file.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 368ce7e28f3..1b623c18371 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -553,7 +553,7 @@ int ha_tina::chain_append()
/* We set up for the next position */
if ((off_t)(chain_ptr - chain) == (chain_size -1))
{
- off_t location= chain_ptr - chain;
+ my_off_t location= chain_ptr - chain;
chain_size += DEFAULT_CHAIN_LENGTH;
if (chain_alloced)
{
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 5b4381396fc..dc00ce214c9 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.h
@@ -63,7 +63,7 @@ class ha_tina: public handler
TINA_SHARE *share; /* Shared lock info */
off_t current_position; /* Current position in the file during a file scan */
off_t next_position; /* Next position in the file scan */
- off_t local_saved_data_file_length; /* save position for reads */
+ my_off_t local_saved_data_file_length; /* save position for reads */
off_t temp_file_length;
uchar byte_buffer[IO_SIZE];
Transparent_file *file_buff;
diff --git a/storage/csv/transparent_file.h b/storage/csv/transparent_file.h
index 4c0f4cce7e7..29da06d5ab7 100644
--- a/storage/csv/transparent_file.h
+++ b/storage/csv/transparent_file.h
@@ -24,7 +24,7 @@ class Transparent_file
uchar *buff; /* in-memory window to the file or mmaped area */
/* current window sizes */
off_t lower_bound;
- off_t upper_bound;
+ my_off_t upper_bound;
uint buff_size;
public: