Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql


Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
This commit is contained in:
unknown 2001-03-12 20:18:16 -07:00
commit 10d5f95eee
8 changed files with 89 additions and 34 deletions

View file

@ -286,7 +286,10 @@ public:
ulong slave_proxy_id; // in slave thread we need to know in behalf of which
// thread the query is being run to replicate temp tables properly
// thread-specific state map for lex parser
uchar state_map[256];
THD();
~THD();
bool store_globals();