diff options
| author | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-21 08:03:52 -0500 |
|---|---|---|
| committer | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-21 08:03:52 -0500 |
| commit | 26416bf5448f45a171fb1e0e28c425f401b1a0aa (patch) | |
| tree | cd8b06154812c8fdd31ac76addbb7e0f2ce187c6 /sql/sql_class.h | |
| parent | 5c9afee608aef412065a90b10032d5ce23c12b1d (diff) | |
| parent | a95646be8d1d56b8ee68ae991ba3c760d9071b94 (diff) | |
| download | mariadb-git-26416bf5448f45a171fb1e0e28c425f401b1a0aa.tar.gz | |
Merge c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-bugs
into c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Manual merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 00440449be8..e78dfed30ab 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1099,6 +1099,9 @@ public: query_id_t query_id, warn_id; ulong thread_id, col_access; +#ifdef ERROR_INJECT_SUPPORT + ulong error_inject_value; +#endif /* Statement id is thread-wide. This counter is used to generate ids */ ulong statement_id_counter; ulong rand_saved_seed1, rand_saved_seed2; |