Correct merge problem

19787199 · magnus@shellback.(none) · 94b305b2 · 19787199
Commit 19787199 authored Sep 28, 2004 by magnus@shellback.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -1

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -656,7 +656,7 @@ int ha_ndbcluster::get_metadata(const char *path)
 		    memcmp(pack_data, tab->getFrmData(), pack_length)));      
 	DBUG_DUMP("pack_data", (char*)pack_data, pack_length);
 	DBUG_DUMP("frm", (char*)tab->getFrmData(), tab->getFrmLength());
-	error= HA_ERR_OLD_METADATA;
+	error= 3;
 	invalidating_ndb_table= false;
      }
    }