diff options
| author | unknown <evgen@moonbone.local> | 2006-07-18 23:45:17 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-18 23:45:17 +0400 |
| commit | dc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f (patch) | |
| tree | a7cde77bb894ad2fe7efa42cf6785616d7604353 /include/mysql.h | |
| parent | ec40f4a588faa4b759816fd619929088b0723c24 (diff) | |
| parent | 7c7396cee5e8f88763a7b3468f4ae3f543195cf2 (diff) | |
| download | mariadb-git-dc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/time.cc:
Auto merged
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__ |