diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-07-14 15:06:04 +0500 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-07-14 15:06:04 +0500 |
| commit | cc541211c8232ff41386f99cebc446da1a06cacf (patch) | |
| tree | 74e564b644c182b72bd6b9ad0cc93ae70454e898 /storage/federated | |
| parent | 880743284eb250e1e1a33b1d3705443741b9cca2 (diff) | |
| parent | f9025ea331802d0427b46235d5ddf15b7ee4e795 (diff) | |
| download | mariadb-git-cc541211c8232ff41386f99cebc446da1a06cacf.tar.gz | |
Merge 5.1-bugteam -> 5.1-innodb_plugin.
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 2fdf1bc7900..8deb8693960 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2828,34 +2828,32 @@ int ha_federated::info(uint flag) if (!(row= mysql_fetch_row(result))) goto error; - if (flag & (HA_STATUS_VARIABLE | HA_STATUS_CONST)) - { - /* - deleted is set in ha_federated::info - */ - /* - need to figure out what this means as far as federated is concerned, - since we don't have a "file" + /* + deleted is set in ha_federated::info + */ + /* + need to figure out what this means as far as federated is concerned, + since we don't have a "file" - data_file_length = ? - index_file_length = ? - delete_length = ? - */ - if (row[4] != NULL) - stats.records= (ha_rows) my_strtoll10(row[4], (char**) 0, + data_file_length = ? + index_file_length = ? + delete_length = ? + */ + if (row[4] != NULL) + stats.records= (ha_rows) my_strtoll10(row[4], (char**) 0, &error); - if (row[5] != NULL) - stats.mean_rec_length= (ulong) my_strtoll10(row[5], (char**) 0, &error); + if (row[5] != NULL) + stats.mean_rec_length= (ulong) my_strtoll10(row[5], (char**) 0, &error); - stats.data_file_length= stats.records * stats.mean_rec_length; + stats.data_file_length= stats.records * stats.mean_rec_length; - if (row[12] != NULL) - stats.update_time= (ulong) my_strtoll10(row[12], (char**) 0, + if (row[12] != NULL) + stats.update_time= (ulong) my_strtoll10(row[12], (char**) 0, &error); - if (row[13] != NULL) - stats.check_time= (ulong) my_strtoll10(row[13], (char**) 0, + if (row[13] != NULL) + stats.check_time= (ulong) my_strtoll10(row[13], (char**) 0, &error); - } + /* size of IO operations (This is based on a good guess, no high science involved) |