diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-08-22 12:21:37 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-08-22 12:21:37 +0400 |
| commit | b5cbed72bcf3879a83709d79ab296e88a8507d58 (patch) | |
| tree | 4712c991015a62194a5051481f22402f3d98b90b /include | |
| parent | e84fd6df5006c3354f0c73f1878bc266d9eef768 (diff) | |
| parent | 877477f173419933f1d7c2b9e06dc7cfe925eb6e (diff) | |
| download | mariadb-git-b5cbed72bcf3879a83709d79ab296e88a8507d58.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21051-2
include/mysql_com.h:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 60e726396cb..e17a06a2f42 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -209,7 +209,13 @@ typedef struct st_net { char last_error[MYSQL_ERRMSG_SIZE], sqlstate[SQLSTATE_LENGTH+1]; unsigned int last_errno; unsigned char error; + + /* + 'query_cache_query' should be accessed only via query cache + functions and methods to maintain proper locking. + */ gptr query_cache_query; + my_bool report_error; /* We should report error (we have unreported error) */ my_bool return_errno; } NET; |