mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
Merge mysql.com:/home/hf/work/29801/my50-29801
into mysql.com:/home/hf/work/30638/my50-30638
This commit is contained in:
commit
dda586282d
1 changed files with 6 additions and 1 deletions
|
@ -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))
|
||||
|
|
Loading…
Reference in a new issue