Commit 5a20acc7 authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)

Merge mysql.com:/home/hf/work/29801/my50-29801

into  mysql.com:/home/hf/work/29801/my51-29801
parents 009d8b60 f8958d05
...@@ -2769,7 +2769,12 @@ int ha_federated::info(uint flag) ...@@ -2769,7 +2769,12 @@ int ha_federated::info(uint flag)
status_query_string.length(0); status_query_string.length(0);
result= mysql_store_result(mysql); 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; goto error;
if (!mysql_num_rows(result)) if (!mysql_num_rows(result))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment