summaryrefslogtreecommitdiff
path: root/storage/federated
diff options
context:
space:
mode:
authorunknown <antony@pcg5ppc.xiphis.org>2007-07-24 07:23:59 -0700
committerunknown <antony@pcg5ppc.xiphis.org>2007-07-24 07:23:59 -0700
commit541e40f9af3ac9b958276eec69809483be19b23a (patch)
tree2236b5f428853cdaaac10eb5bad12cefbcddf5f3 /storage/federated
parente1b3b9317e5afffbebbe3387bcfa7354b85e3a51 (diff)
downloadmariadb-git-541e40f9af3ac9b958276eec69809483be19b23a.tar.gz
post 5.0 to 5.1 merge fixes
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/ha_federated.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 9d070dfa7b1..ebc8f898341 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -2029,7 +2029,7 @@ int ha_federated::write_row(uchar *buf)
update_auto_increment();
/* mysql_insert() uses this for protocol return value */
- table->next_number_field->store(auto_increment_value, 1);
+ table->next_number_field->store(stats.auto_increment_value, 1);
}
DBUG_RETURN(0);
@@ -2940,7 +2940,7 @@ int ha_federated::info(uint flag)
}
if (flag & HA_STATUS_AUTO)
- auto_increment_value= mysql->last_used_con->insert_id;
+ stats.auto_increment_value= mysql->last_used_con->insert_id;
mysql_free_result(result);