diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2002-02-01 21:45:23 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2002-02-01 21:45:23 +0200 |
| commit | 3ec0936d1579e2b321f5857b89c7589f7da97f25 (patch) | |
| tree | f9256f4f3c5991aeafe2c0fce4dcbbdcdb66e278 | |
| parent | ee76008d443634fb307a88961914d8c26757bb8f (diff) | |
| download | mariadb-git-3ec0936d1579e2b321f5857b89c7589f7da97f25.tar.gz | |
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 ...
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 10 | ||||
| -rw-r--r-- | sql/sql_class.h | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 963e62ddd45..6781375218d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -459,3 +459,4 @@ vio/test-sslclient vio/test-sslserver vio/viotest-ssl Docs/mysql.xml +mysql-test/r/rpl000001.eval diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 7cfe801e6f0..577084a650a 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -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 *****************************************************************************/ diff --git a/sql/sql_class.h b/sql/sql_class.h index 8e663a0cdf5..a1423cfcdf1 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -342,6 +342,7 @@ public: 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; |