diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
| commit | 2dfdcae3989a12e513aee2ba2df86edfb27b0e7e (patch) | |
| tree | 942c3cb8d61303a6fe7a697ad2c646f07cb442b8 /include/mysql.h | |
| parent | 8f5681c91915db689a4bbfa95346705cbb51f717 (diff) | |
| parent | d9992cc79eb8c51c2b967ec60137638583a8143d (diff) | |
| download | mariadb-git-2dfdcae3989a12e513aee2ba2df86edfb27b0e7e.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into mysql.com:/home/hf/work/mysql-5.0.mrg
libmysqld/embedded_priv.h:
Auto merged
sql-common/client.c:
Auto merged
include/mysql.h:
merging
libmysql/libmysql.c:
merging
libmysqld/lib_sql.cc:
merging
libmysqld/libmysqld.c:
merging
sql/sql_parse.cc:
merging
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/mysql.h b/include/mysql.h index 3a71e47f414..7ed205024e2 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -236,6 +236,7 @@ typedef struct character_set } MY_CHARSET_INFO; struct st_mysql_methods; +struct st_mysql_stmt; typedef struct st_mysql { @@ -293,6 +294,12 @@ 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 { @@ -745,7 +752,8 @@ typedef struct st_mysql_methods unsigned long header_length, const char *arg, unsigned long arg_length, - my_bool skip_check); + my_bool skip_check, + MYSQL_STMT *stmt); MYSQL_DATA *(*read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields, unsigned int fields); MYSQL_RES * (*use_result)(MYSQL *mysql); @@ -835,8 +843,11 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); */ #define simple_command(mysql, command, arg, length, skip_check) \ - (*(mysql)->methods->advanced_command)(mysql, command, \ - NullS, 0, arg, length, skip_check) + (*(mysql)->methods->advanced_command)(mysql, command, NullS, \ + 0, arg, length, skip_check, NULL) +#define stmt_command(mysql, command, arg, length, stmt) \ + (*(mysql)->methods->advanced_command)(mysql, command, NullS, \ + 0, arg, length, 1, stmt) unsigned long net_safe_read(MYSQL* mysql); #ifdef __NETWARE__ |