diff options
author | He Zhenxing <zhenxing.he@sun.com> | 2009-04-08 16:17:26 +0800 |
---|---|---|
committer | He Zhenxing <zhenxing.he@sun.com> | 2009-04-08 16:17:26 +0800 |
commit | 16641a882048f7bec779d786798771609c9d57dc (patch) | |
tree | 690e34ec8eb6f78c27c0bc0a15937b7c14e7d56f /sql/sql_class.cc | |
parent | 51a91166387760546d563ebf72bfa037fcff24a8 (diff) | |
parent | 10350e2097393cb7410eedfcf6ba533faba20a56 (diff) | |
download | mariadb-git-16641a882048f7bec779d786798771609c9d57dc.tar.gz |
Auto merge
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 74bc669a049..4389fd5039e 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -219,6 +219,7 @@ THD::THD() one_shot_set= 0; file_id = 0; query_id= 0; + query_name_consts= 0; warn_id= 0; db_charset= global_system_variables.collation_database; bzero(ha_data, sizeof(ha_data)); @@ -2144,6 +2145,13 @@ void Security_context::skip_grants() } +bool Security_context::user_matches(Security_context *them) +{ + return ((user != NULL) && (them->user != NULL) && + !strcmp(user, them->user)); +} + + /**************************************************************************** Handling of open and locked tables states. |