Commit d415b0d4 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  siva.hindu.god:/usr/home/tim/m/bk/50
parents 5a88282e 338c36c6

include/mysql.h

+0 −6
Original line number Diff line number Diff line
@@ -293,12 +293,6 @@ typedef struct st_mysql 
  /* needed for embedded server - no net buffer to store the 'info' */

  char *info_buffer;

#endif

  /*

    In embedded server it points to the statement that is processed

    in the current query. We store some results directly in statement

    fields then.

  */

  struct st_mysql_stmt *current_stmt;

} MYSQL;



typedef struct st_mysql_res {

libmysqld/lib_sql.cc

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, 
  mysql->affected_rows= ~(my_ulonglong) 0;

  mysql->field_count= 0;

  net->last_errno= 0;

  mysql->current_stmt= stmt;



  thd->store_globals();				// Fix if more than one connect

  /*