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

Merge mysql.com:/home/my/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.1
This commit is contained in:
monty@mysql.com
2006-02-25 21:54:34 +02:00
parent 066c7148fb 54274976e7
commit 1e2e9e2856
45 changed files with 10745 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -629,6 +629,7 @@ void xid_cache_delete(XID_STATE *xid_state);
class Security_context {
public:
Security_context() {} /* Remove gcc warning */
/*
host - host of the client
user - user of the client, set to NULL until the user has been read from
@ -1467,6 +1468,7 @@ public:
class select_result_interceptor: public select_result
{
public:
select_result_interceptor() {} /* Remove gcc warning */
uint field_count(List<Item> &fields) const { return 0; }
bool send_fields(List<Item> &fields, uint flag) { return FALSE; }
};
@ -1757,6 +1759,7 @@ class Table_ident :public Sql_alloc
class user_var_entry
{
public:
user_var_entry() {} /* Remove gcc warning */
LEX_STRING name;
char *value;
ulong length;