diff options
| author | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
| commit | a62ee2202f86c47f6a8d6d05948e181d73d56ba1 (patch) | |
| tree | e1ac6531db331ae24b2dcfca9ab05c0a35f3fc92 /sql/sql_class.h | |
| parent | 4ae5fd0b892748925b3899131adc2c192453f693 (diff) | |
| parent | 4c4c31db7b34082901fb976371914f9d5e8c952f (diff) | |
| download | mariadb-git-a62ee2202f86c47f6a8d6d05948e181d73d56ba1.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_pkg.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7b5a6da8c6b..b625a78b867 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -335,6 +335,10 @@ class select_result; #define THD_SENTRY_MAGIC 0xfeedd1ff #define THD_SENTRY_GONE 0xdeadbeef +#ifdef EMBEDDED_LIBRARY +typedef struct st_mysql; +#endif + #define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC) struct system_variables @@ -393,6 +397,9 @@ public: struct rand_struct rand; // used for authentication struct system_variables variables; // Changeable local variables pthread_mutex_t LOCK_delete; // Locked before thd is deleted +#ifdef EMBEDDED_LIBRARY + struct st_mysql *mysql; +#endif char *query; // Points to the current query, /* |