Commit a8e29573 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/mysql_src/mysql-5.0-xa
parents 5a5fc343 41624daa

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.disabled

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
Patrick Galbraith should fix this

mysql-test/t/federated.test

+373 −215

File changed.

Preview size limit exceeded, changes collapsed.

server-tools/instance-manager/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \ 


CLEANFILES= net_serv.cc client_settings.h



net_serv.cc: Makefile

net_serv.cc:

	rm -f $(srcdir)/net_serv.cc

	@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc



client_settings.h: Makefile

client_settings.h:

	rm -f $(srcdir)/client_settings.h

	@LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h