Commit b7943b7a authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 

into krsna.patg.net:/home/patg/mysql-5.0


sql/handler.cc:
  Auto merged
parents ecdfe7c2 055273c1

libmysql/libmysql.c

+0 −19
Original line number Diff line number Diff line
@@ -1115,25 +1115,6 @@ mysql_fetch_field(MYSQL_RES *result) 
}





/**************************************************************************

  Get column lengths of the current row

  If one uses mysql_use_result, res->lengths contains the length information,

  else the lengths are calculated from the offset between pointers.

**************************************************************************/



ulong * STDCALL

mysql_fetch_lengths(MYSQL_RES *res)

{

  MYSQL_ROW column;



  if (!(column=res->current_row))

    return 0;					/* Something is wrong */

  if (res->data)

    (*res->methods->fetch_lengths)(res->lengths, column, res->field_count);

  return res->lengths;

}





/**************************************************************************

  Move to a specific row and column

**************************************************************************/

mysql-test/r/federated.result

+322 −185

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/federated.test

+373 −215

File changed.

Preview size limit exceeded, changes collapsed.

sql-common/client.c

+19 −0
Original line number Diff line number Diff line
@@ -2628,6 +2628,25 @@ mysql_fetch_row(MYSQL_RES *res) 
}





/**************************************************************************

  Get column lengths of the current row

  If one uses mysql_use_result, res->lengths contains the length information,

  else the lengths are calculated from the offset between pointers.

**************************************************************************/



ulong * STDCALL

mysql_fetch_lengths(MYSQL_RES *res)

{

  MYSQL_ROW column;



  if (!(column=res->current_row))

    return 0;					/* Something is wrong */

  if (res->data)

    (*res->methods->fetch_lengths)(res->lengths, column, res->field_count);

  return res->lengths;

}





int STDCALL

mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)

{

sql/ha_federated.cc

+574 −475

File changed.

Preview size limit exceeded, changes collapsed.