mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
into  mysql.com:/home/hf/work/29801/my51-29801


storage/federated/ha_federated.cc:
  Auto merged
This commit is contained in:
unknown 2007-10-22 10:21:32 +05:00
commit 9b7160dff4
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
storage/federated/ha_federated.cc
View file

@ -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))