summaryrefslogtreecommitdiff
path: root/sql/examples
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2005-06-01 18:48:29 -0700
committerunknown <brian@zim.(none)>2005-06-01 18:48:29 -0700
commite2bf6b04a6d97a6680cd4deb653fc92e6604bfea (patch)
tree6a69ff42d381e6dc38ff3518c762a6fdb7a8bb0c /sql/examples
parente71ef9416f84922310f88c1cd7295334dadfeb68 (diff)
parent0218ecf7af9bb7dee577ec01f42f602205ec3483 (diff)
downloadmariadb-git-e2bf6b04a6d97a6680cd4deb653fc92e6604bfea.tar.gz
Merge
sql/ha_heap.cc: Auto merged sql/item_subselect.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_example.cc: Auto merged sql/examples/ha_tina.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_repl.cc: SCCS merged
Diffstat (limited to 'sql/examples')
-rw-r--r--sql/examples/ha_archive.cc7
-rw-r--r--sql/examples/ha_example.cc4
-rw-r--r--sql/examples/ha_tina.cc37
3 files changed, 16 insertions, 32 deletions
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index 51268fd60b3..e58996d3c01 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -577,7 +577,7 @@ int ha_archive::write_row(byte * buf)
written= gzwrite(share->archive_write, buf, table->reclength);
DBUG_PRINT("ha_archive::get_row", ("Wrote %d bytes expected %d", written, table->reclength));
share->dirty= TRUE;
- if (written != table->reclength)
+ if (written != (z_off_t)table->reclength)
goto error;
/*
We should probably mark the table as damagaged if the record is written
@@ -592,7 +592,7 @@ int ha_archive::write_row(byte * buf)
{
(*field)->get_ptr(&ptr);
written= gzwrite(share->archive_write, ptr, (unsigned)size);
- if (written != size)
+ if (written != (z_off_t)size)
goto error;
}
}
@@ -615,7 +615,6 @@ error:
int ha_archive::rnd_init(bool scan)
{
DBUG_ENTER("ha_archive::rnd_init");
- int read; // gzread() returns int, and we use this to check the header
/* We rewind the file so that we can read from the beginning if scan */
if (scan)
@@ -749,7 +748,7 @@ int ha_archive::rnd_pos(byte * buf, byte *pos)
DBUG_ENTER("ha_archive::rnd_pos");
statistic_increment(ha_read_rnd_count,&LOCK_status);
current_position= ha_get_ptr(pos, ref_length);
- z_off_t seek= gzseek(archive, current_position, SEEK_SET);
+ (void)gzseek(archive, current_position, SEEK_SET);
DBUG_RETURN(get_row(archive, buf));
}
diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc
index b122c4dc83f..2592d307e37 100644
--- a/sql/examples/ha_example.cc
+++ b/sql/examples/ha_example.cc
@@ -152,10 +152,8 @@ static EXAMPLE_SHARE *get_share(const char *table_name, TABLE *table)
return share;
-error2:
- thr_lock_delete(&share->lock);
- pthread_mutex_destroy(&share->mutex);
error:
+ pthread_mutex_destroy(&share->mutex);
pthread_mutex_unlock(&example_mutex);
my_free((gptr) share, MYF(0));
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc
index 44040ad3b61..16e28e5ae85 100644
--- a/sql/examples/ha_tina.cc
+++ b/sql/examples/ha_tina.cc
@@ -20,10 +20,10 @@
First off, this is a play thing for me, there are a number of things wrong with it:
*) It was designed for csv and therefor its performance is highly questionable.
*) Indexes have not been implemented. This is because the files can be traded in
- and out of the table directory without having to worry about rebuilding anything.
+ and out of the table directory without having to worry about rebuilding anything.
*) NULLs and "" are treated equally (like a spreadsheet).
*) There was in the beginning no point to anyone seeing this other then me, so there
- is a good chance that I haven't quite documented it well.
+ is a good chance that I haven't quite documented it well.
*) Less design, more "make it work"
Now there are a few cool things with it:
@@ -91,12 +91,12 @@ int get_mmap(TINA_SHARE *share, int write)
{
if (write)
share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size,
- PROT_READ|PROT_WRITE, MAP_SHARED,
- share->data_file, 0);
+ PROT_READ|PROT_WRITE, MAP_SHARED,
+ share->data_file, 0);
else
share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size,
- PROT_READ, MAP_PRIVATE,
- share->data_file, 0);
+ PROT_READ, MAP_PRIVATE,
+ share->data_file, 0);
if ((share->mapped_file ==(caddr_t)-1))
{
/*
@@ -146,9 +146,9 @@ static TINA_SHARE *get_share(const char *table_name, TABLE *table)
{
char data_file_name[FN_REFLEN];
if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
- &share, sizeof(*share),
- &tmp_name, length+1,
- NullS))
+ &share, sizeof(*share),
+ &tmp_name, length+1,
+ NullS))
{
pthread_mutex_unlock(&tina_mutex);
return NULL;
@@ -343,7 +343,6 @@ int ha_tina::find_current_row(byte *buf)
for (Field **field=table->field ; *field ; field++)
{
- int x;
buffer.length(0);
mapped_ptr++; // Increment past the first quote
for(;mapped_ptr != end_ptr; mapped_ptr++)
@@ -738,28 +737,16 @@ int ha_tina::rnd_end()
*/
qsort(chain, (size_t)(chain_ptr - chain), sizeof(tina_set), (qsort_cmp)sort_set);
for (ptr= chain; ptr < chain_ptr; ptr++)
- printf("Chain %d, %d\n", (int)ptr->begin, (int)ptr->end);
- for (ptr= chain; ptr < chain_ptr; ptr++)
{
- //memmove(share->mapped_file + ptr->begin, share->mapped_file
- //+ ptr->end, length - (size_t)ptr->end);
/* We peek a head to see if this is the last chain */
- printf("Delete %d, %d, %d\n", (int)ptr->begin, (int)ptr->end, (int)length);
if (ptr+1 == chain_ptr)
- {
- printf("Shiftina(end) %d(%d) to %d\n", (int)ptr->end, (int)(length - (size_t)ptr->end), (int)ptr->begin);
memmove(share->mapped_file + ptr->begin, share->mapped_file + ptr->end,
length - (size_t)ptr->end);
- }
else
- {
- printf("Shifting %d(%d) to %d\n", (int)ptr->end, (int)((ptr++)->begin - (size_t)ptr->end), (int)ptr->begin);
- memmove(share->mapped_file + ptr->begin, share->mapped_file + ptr->end,
- (size_t)(ptr++)->begin - (size_t)ptr->end);
- }
+ memmove((caddr_t)share->mapped_file + ptr->begin, (caddr_t)share->mapped_file + ptr->end,
+ (size_t)((ptr++)->begin - ptr->end));
length= length - (size_t)(ptr->end - ptr->begin);
}
- printf("Buffer %s\n",share->mapped_file);
/* Truncate the file to the new size */
if (my_chsize(share->data_file, length, 0, MYF(MY_WME)))
@@ -842,7 +829,7 @@ int ha_tina::create(const char *name, TABLE *table_arg, HA_CREATE_INFO *create_i
DBUG_ENTER("ha_tina::create");
if ((create_file= my_create(fn_format(name_buff,name,"",".CSV",MY_REPLACE_EXT|MY_UNPACK_FILENAME),0,
- O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
+ O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
DBUG_RETURN(-1);
my_close(create_file,MYF(0));