Commit bf19259d authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)
Browse files

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

into  mysql.com:/home/hf/work/30638/my50-30638
parents 047dd70c f8958d05

sql/ha_federated.cc

+6 −1
Original line number Diff line number Diff line
@@ -2528,7 +2528,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))