Commit 3ec0936d authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

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 ...
parent ee76008d

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -459,3 +459,4 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

Docs/mysql.xml

mysql-test/r/rpl000001.eval

sql/sql_acl.cc

+10 −0
Original line number Diff line number Diff line
@@ -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

*****************************************************************************/

sql/sql_class.h

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ class THD :public ilink { 
  ha_rows    select_limit,offset_limit,default_select_limit,cuted_fields,

             max_join_size, sent_row_count, examined_row_count;

  table_map  used_tables;

  UC *user_connect;

  ulong	     query_id,version, inactive_timeout,options,thread_id;

  long	     dbug_thread_id;

  pthread_t  real_id;