summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <brian@avenger.(none)>2004-12-06 16:26:05 -0800
committerunknown <brian@avenger.(none)>2004-12-06 16:26:05 -0800
commite1248f4fc392d20ff34084ee913df90815d15008 (patch)
treead5cda72254f90f9b31791f08bbc47e6e96ac065
parent8ec6cf2cd5ed54f1336784ffe548a813cbbde172 (diff)
downloadmariadb-git-e1248f4fc392d20ff34084ee913df90815d15008.tar.gz
Fix for crummy compiler that didn't udnerstand for declaration. Another fix for example storage engine to pass, not skip, test.
mysql-test/r/have_exampledb.require: Fix for test for examples. sql/examples/ha_archive.cc: Fix for compiler that had problem with ANSI C.
-rw-r--r--mysql-test/r/have_exampledb.require2
-rw-r--r--sql/examples/ha_archive.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/have_exampledb.require b/mysql-test/r/have_exampledb.require
index 4b0938660fe..29d0cf8b1a6 100644
--- a/mysql-test/r/have_exampledb.require
+++ b/mysql-test/r/have_exampledb.require
@@ -1,2 +1,2 @@
Variable_name Value
-have_exampledb YES
+have_example_engine YES
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index 6fbfb3f9f9d..771bf91d118 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -528,6 +528,7 @@ error:
int ha_archive::write_row(byte * buf)
{
z_off_t written;
+ Field_blob **field;
DBUG_ENTER("ha_archive::write_row");
statistic_increment(ha_write_count,&LOCK_status);
@@ -543,7 +544,7 @@ int ha_archive::write_row(byte * buf)
We should probably mark the table as damagaged if the record is written
but the blob fails.
*/
- for (Field_blob **field=table->blob_field ; *field ; field++)
+ for (field= table->blob_field ; *field ; field++)
{
char *ptr;
uint32 size= (*field)->get_length();