Commit 81dac08b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt 

into  mysql.com:/home/hf/work/current_stmt/my50-current_stmt


include/mysql.h:
  merging
libmysqld/lib_sql.cc:
  merging
sql/sql_class.h:
  merging
parents ab133655 6c4aa883

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 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->current_stmt= stmt;



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

  /*

sql/sql_class.h

+6 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,12 @@ class THD :public Statement, 
  struct st_mysql_data **data_tail;

  void clear_data_list();

  struct st_mysql_data *alloc_new_dataset();

  /*

    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;

#endif

  NET	  net;				// client connection descriptor

  MEM_ROOT warn_root;			// For warnings and errors