diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-22 10:21:32 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-22 10:21:32 +0500 |
| commit | 9b7160dff4bfcdbafa1fda1dd53b60f976c488b4 (patch) | |
| tree | 2c024879fa351375faa59ef50db150cae4dbafd1 /storage/federated | |
| parent | 6356f16196be6492f7b18cc06df53075a2b14203 (diff) | |
| parent | 173eb806db267db78b33b811a5b173c909a8c94b (diff) | |
| download | mariadb-git-9b7160dff4bfcdbafa1fda1dd53b60f976c488b4.tar.gz | |
Merge mysql.com:/home/hf/work/29801/my50-29801
into mysql.com:/home/hf/work/29801/my51-29801
storage/federated/ha_federated.cc:
Auto merged
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 3fc17e18e76..8673847fcac 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2769,7 +2769,12 @@ int ha_federated::info(uint flag) status_query_string.length(0); result= mysql_store_result(mysql); - if (!result) + + /* + We're going to use fields num. 4, 12 and 13 of the resultset, + so make sure we have these fields. + */ + if (!result || (mysql_num_fields(result) < 14)) goto error; if (!mysql_num_rows(result)) |