summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorjani@a88-113-38-195.elisa-laajakaista.fi <>2007-05-31 17:45:22 +0300
committerjani@a88-113-38-195.elisa-laajakaista.fi <>2007-05-31 17:45:22 +0300
commit2c8f4f97910bec416fc9a375cf1c74be2ca395cc (patch)
treec5cb3acad2572a7c0914ef20f2d942ea40433ab7 /storage
parentb035219762efeea657e687cf7b43279d7962a2eb (diff)
downloadmariadb-git-2c8f4f97910bec416fc9a375cf1c74be2ca395cc.tar.gz
Added casts to avoid compiler warnings and fixed a wrong type.
--- Added casts and fixed wrong type. --- Added casts and fixed wrong type. --- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel --- Don't give warning that readonly variable is forced to be readonly mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file Fixed wrong reference to the mysql manual Fixed wrong prototype that caused some tests to fail on 64 bit platforms --- Disabled compiler warnings mainly for Win 64. --- Added casts to remove compiler warnings on windows Give warnings also for safe_mutex errors found by test system Added some warnings from different machines in pushbuild --- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into mysql.com:/home/my/mysql-5.1 --- Added escapes for double quotes and parenthesis. --- Archive db fix plus added non-critical warnings in ignore list. --- Fixed previously added patch and added new ignored warning.
Diffstat (limited to 'storage')
-rw-r--r--storage/archive/azio.c4
-rw-r--r--storage/blackhole/ha_blackhole.cc4
-rw-r--r--storage/example/ha_example.cc2
3 files changed, 7 insertions, 3 deletions
diff --git a/storage/archive/azio.c b/storage/archive/azio.c
index 1f7e9d7c1de..ee2fee34953 100644
--- a/storage/archive/azio.c
+++ b/storage/archive/azio.c
@@ -557,6 +557,7 @@ int do_flush (azio_stream *s, int flush)
{
uInt len;
int done = 0;
+ my_off_t afterwrite_pos;
if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
@@ -597,7 +598,10 @@ int do_flush (azio_stream *s, int flush)
s->dirty= AZ_STATE_CLEAN; /* Mark it clean, we should be good now */
else
s->dirty= AZ_STATE_SAVED; /* Mark it clean, we should be good now */
+
+ afterwrite_pos= my_tell(s->file, MYF(0));
write_header(s);
+ my_seek(s->file, afterwrite_pos, SEEK_SET, MYF(0));
return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
}
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index 1441b7f71fb..03da7808948 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -287,8 +287,8 @@ static void blackhole_free_key(st_blackhole_share *share)
my_free((uchar*) share, MYF(0));
}
-static uchar* blackhole_get_key(st_blackhole_share *share, uint *length,
- my_bool not_used __attribute__((unused)))
+static uchar* blackhole_get_key(st_blackhole_share *share, size_t *length,
+ my_bool not_used __attribute__((unused)))
{
*length= share->table_name_length;
return (uchar*) share->table_name;
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index cd43672bb88..06efc727837 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -114,7 +114,7 @@ pthread_mutex_t example_mutex;
Function we use in the creation of our hash to get key.
*/
-static uchar* example_get_key(EXAMPLE_SHARE *share,uint *length,
+static uchar* example_get_key(EXAMPLE_SHARE *share, size_t *length,
my_bool not_used __attribute__((unused)))
{
*length=share->table_name_length;