database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merging

Browse Source
This commit is contained in:
hf@deer.mysql.r18.ru
2002-12-16 18:58:55 +04:00
parent 79a184fe09 e3b3b68307
commit c1e69d2cca
47 changed files with 1385 additions and 1478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_class.h
View File

@ -178,6 +178,9 @@ public:
convert_array(from_map, (uchar*) a,length);
}
bool store(String *, const char *,uint);
#ifdef EMBEDDED_LIBRARY
void convert_back(char *dest, const char *source, uint length) const;
#endif
inline uint number() { return numb; }
};
@ -338,6 +341,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
@ -381,9 +388,11 @@ struct system_variables
For each client connection we create a separate thread with THD serving as
a thread/connection descriptor
*/
class THD :public ilink {
public:
#ifdef EMBEDDED_LIBRARY
struct st_mysql *mysql;
#endif
NET net; // client connection descriptor
LEX lex; // parse tree descriptor
MEM_ROOT mem_root; // 1 command-life memory pool
@ -541,6 +550,7 @@ public:
THD();
~THD();
void init(void);
void change_user(void);
void cleanup(void);
@ -636,12 +646,17 @@ public:
void add_changed_table(const char *key, long key_length);
CHANGED_TABLE_LIST * changed_table_dup(const char *key, long key_length);
int send_explain_fields(select_result *result);
#ifndef EMBEDDED_LIBRARY
inline void clear_error()
{
net.last_error[0]= 0;
net.last_errno= 0;
net.report_error= 0;
}
#else
void clear_error();
#endif
void add_possible_loop(Item *);
};