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

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

sql/sql_acl.h

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

sql/sql_class.cc

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

sql/structs.h

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