Commit f8cbf8f9 authored by unknown's avatar unknown

BK makes me problems.

I did not know I can't do chmod ...
So, it killed some of my changes. 
But I am smarter, and as I have first saved my work, before BK ruined
it, so here it comes ...


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl000001.eval to the ignore list
parent 1c7dbd8c
...@@ -459,3 +459,4 @@ vio/test-sslclient ...@@ -459,3 +459,4 @@ vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
Docs/mysql.xml Docs/mysql.xml
mysql-test/r/rpl000001.eval
...@@ -2849,6 +2849,16 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user) ...@@ -2849,6 +2849,16 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user)
} }
uint get_mqh(const char *user, const char *host)
{
if (!initialized) return 0;
ACL_USER *acl_user;
acl_user= find_acl_user(host,user);
return (acl_user) ? acl_user->questions : 0;
}
/***************************************************************************** /*****************************************************************************
** Instantiate used templates ** Instantiate used templates
*****************************************************************************/ *****************************************************************************/
......
...@@ -342,6 +342,7 @@ public: ...@@ -342,6 +342,7 @@ public:
ha_rows select_limit,offset_limit,default_select_limit,cuted_fields, ha_rows select_limit,offset_limit,default_select_limit,cuted_fields,
max_join_size, sent_row_count, examined_row_count; max_join_size, sent_row_count, examined_row_count;
table_map used_tables; table_map used_tables;
UC *user_connect;
ulong query_id,version, inactive_timeout,options,thread_id; ulong query_id,version, inactive_timeout,options,thread_id;
long dbug_thread_id; long dbug_thread_id;
pthread_t real_id; pthread_t real_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment