diff options
| author | unknown <holyfoot@mysql.com> | 2006-01-23 11:59:31 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-01-23 11:59:31 +0400 |
| commit | 793a8bb7c3b237ae73fbe7edab1672b8d48bfb5d (patch) | |
| tree | 388c5aee815346e2a7a5e27f08fc2539f026e738 /sql/sql_class.h | |
| parent | 4649ac07467c0912d51480e101f8d63d5859ec2a (diff) | |
| parent | 823ec15c65d9831fdf3a3521b214dbf1a20ca1ec (diff) | |
| download | mariadb-git-793a8bb7c3b237ae73fbe7edab1672b8d48bfb5d.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 27b3f9df300..00440449be8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -804,13 +804,16 @@ public: #ifdef EMBEDDED_LIBRARY struct st_mysql *mysql; - struct st_mysql_data *data; unsigned long client_stmt_id; unsigned long client_param_count; struct st_mysql_bind *client_params; char *extra_data; ulong extra_length; - String query_rest; + struct st_mysql_data *cur_data; + struct st_mysql_data *first_data; + struct st_mysql_data **data_tail; + void clear_data_list(); + struct st_mysql_data *alloc_new_dataset(); #endif NET net; // client connection descriptor MEM_ROOT warn_root; // For warnings and errors @@ -1447,6 +1450,11 @@ public: */ virtual void cleanup(); void set_thd(THD *thd_arg) { thd= thd_arg; } +#ifdef EMBEDDED_LIBRARY + virtual void begin_dataset() {} +#else + void begin_dataset() {} +#endif }; |