diff options
| author | unknown <kostja@bodhi.local> | 2006-08-30 00:45:33 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-30 00:45:33 +0400 |
| commit | 8ea5f31a46e9edcd773a1ce3655c8ce9e0d0ed33 (patch) | |
| tree | 55ee75a4f6e2dfc6ac630c5e0f0e66445bae20fb /include | |
| parent | 01ec88dcd8d49aede05ba1f22270708d132f3ffe (diff) | |
| parent | 4355ea5a38c819cf1e98089b3d85fc628c48da46 (diff) | |
| download | mariadb-git-8ea5f31a46e9edcd773a1ce3655c8ce9e0d0ed33.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-14897
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/grant.result:
Manual merge.
mysql-test/r/view.result:
Manual merge.
mysql-test/t/grant.test:
Manual merge.
mysql-test/t/view.test:
Manual merge.
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; |