1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

Browse Source 
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
This commit is contained in:
unknown 2002-02-01 20:31:17 +02:00
commit bd35c06821
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_acl.h
View File

@ -82,3 +82,4 @@ bool check_grant_db(THD *thd,const char *db);
uint get_table_grant(THD *thd, TABLE_LIST *table); uint get_table_grant(THD *thd, TABLE_LIST *table);
uint get_column_grant(THD *thd, TABLE_LIST *table, Field *field); uint get_column_grant(THD *thd, TABLE_LIST *table, Field *field);
int mysql_show_grants(THD *thd, LEX_USER *user); int mysql_show_grants(THD *thd, LEX_USER *user);
uint get_mqh(const char *user, const char *host);

1
sql/sql_class.cc
View File

@ -141,6 +141,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
(void (*)(void*)) free_var,0); (void (*)(void*)) free_var,0);
#ifdef USING_TRANSACTIONS #ifdef USING_TRANSACTIONS
bzero((char*) &transaction,sizeof(transaction)); bzero((char*) &transaction,sizeof(transaction));
user_connect=(UC *)0;
if (opt_using_transactions) if (opt_using_transactions)
{ {
if (open_cached_file(&transaction.trans_log, if (open_cached_file(&transaction.trans_log,

8
sql/structs.h
View File

@ -160,6 +160,14 @@ typedef struct st_lex_user {
LEX_STRING user, host, password; LEX_STRING user, host, password;
} LEX_USER; } LEX_USER;
typedef struct user_conn {
char *user;
uint len, connections, questions, max_questions;
time_t intime;
} UC;
/* Bits in form->update */ /* Bits in form->update */
#define REG_MAKE_DUPP 1 /* Make a copy of record when read */ #define REG_MAKE_DUPP 1 /* Make a copy of record when read */
#define REG_NEW_RECORD 2 /* Write a new record if not found */ #define REG_NEW_RECORD 2 /* Write a new record if not found */