diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
| commit | befbebcfdb0749fc0167a7652900abae6a0060e7 (patch) | |
| tree | 89185b0d10c5b8c12807ce8fcb41122c9cf5c18e /include | |
| parent | e3a9d9493556d159a580d7e266770fcaf38c7343 (diff) | |
| parent | 0fb7649940c849f4df4ceca7d01f5e8946ffbb0d (diff) | |
| download | mariadb-git-befbebcfdb0749fc0167a7652900abae6a0060e7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
client/mysqltest.c:
Auto merged
Makefile.am:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 6 | ||||
| -rw-r--r-- | include/mysql_h.ic | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/mysql.h b/include/mysql.h index bc99b6f6ba1..55ef6ee6d10 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -281,12 +281,6 @@ typedef struct st_mysql from mysql_stmt_close if close had to cancel result set of this object. */ my_bool *unbuffered_fetch_owner; - /* - 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 { diff --git a/include/mysql_h.ic b/include/mysql_h.ic index 30ef44a1ccb..44c36c84747 100644 --- a/include/mysql_h.ic +++ b/include/mysql_h.ic @@ -154,7 +154,6 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned struct st_mysql_methods const * methods; void * thd; my_bool * unbuffered_fetch_owner; - struct st_mysql_stmt * current_stmt; }; # 571 "mysql.h" struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_mysql_bind |