diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-12 17:38:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-12 17:38:13 +0200 |
| commit | 4c576fd4927fffbf7cb11f011ff05fc91f9c01e7 (patch) | |
| tree | 7673fdeb32bf17a0bb45b3804f7886e69728254a /storage/federated | |
| parent | e6ba9d285aa41bb3d691cba7445b9b5479e34eaf (diff) | |
| parent | d0e8dbc4a359d3fe354fff95e293bd1783ae009e (diff) | |
| download | mariadb-git-4c576fd4927fffbf7cb11f011ff05fc91f9c01e7.tar.gz | |
Merge with 5.1
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index fcc178b09a6..34509e04799 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2453,7 +2453,6 @@ int ha_federated::index_init(uint keynr, bool sorted) { DBUG_ENTER("ha_federated::index_init"); DBUG_PRINT("info", ("table: '%s' key: %u", table->s->table_name.str, keynr)); - active_index= keynr; DBUG_RETURN(0); } @@ -2589,7 +2588,6 @@ int ha_federated::index_end(void) { DBUG_ENTER("ha_federated::index_end"); free_result(); - active_index= MAX_KEY; DBUG_RETURN(0); } |