database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/gluh/MySQL/Merge/5.0

Browse Source 
into  mysql.com:/home/gluh/MySQL/Merge/5.1


include/mysql_com.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sp.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_class.h:
  manual merge
sql/table.cc:
  manual merge
This commit is contained in:
unknown
2006-09-28 14:09:31 +05:00
parent 5529b7fb95 c316933e60
commit 5f10ffd064
13 changed files with 35 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_acl.cc
View File

@ -169,7 +169,7 @@ static byte* acl_entry_get_key(acl_entry *entry,uint *length,
}
#define IP_ADDR_STRLEN (3+1+3+1+3+1+3)
#define ACL_KEY_LENGTH (IP_ADDR_STRLEN+1+NAME_BYTE_LEN+1+USERNAME_BYTE_LENGTH+1)
#define ACL_KEY_LENGTH (IP_ADDR_STRLEN+1+NAME_LEN+1+USERNAME_LENGTH+1)
static DYNAMIC_ARRAY acl_hosts,acl_users,acl_dbs;
static MEM_ROOT mem, memex;
@ -312,7 +312,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
READ_RECORD read_record_info;
my_bool return_val= 1;
bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE;
char tmp_name[NAME_BYTE_LEN+1];
char tmp_name[NAME_LEN+1];
int password_length;
DBUG_ENTER("acl_load");
@ -2401,7 +2401,7 @@ static GRANT_NAME *name_hash_search(HASH *name_hash,
const char *user, const char *tname,
bool exact)
{
char helping [NAME_BYTE_LEN*2+USERNAME_BYTE_LENGTH+3];
char helping [NAME_LEN*2+USERNAME_LENGTH+3];
uint len;
GRANT_NAME *grant_name,*found=0;
HASH_SEARCH_STATE state;
@ -3308,7 +3308,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
{
List_iterator <LEX_USER> str_list (list);
LEX_USER *Str, *tmp_Str;
char tmp_db[NAME_BYTE_LEN+1];
char tmp_db[NAME_LEN+1];
bool create_new_users=0;
TABLE_LIST tables[2];
DBUG_ENTER("mysql_grant");
@ -3372,7 +3372,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
{
result= TRUE;
continue;
}
}
if (replace_user_table(thd, tables[0].table, *Str,
(!db ? rights : 0), revoke_grant, create_new_users,
test(thd->variables.sql_mode &
@ -4012,7 +4012,7 @@ err2:
bool check_grant_db(THD *thd,const char *db)
{
Security_context *sctx= thd->security_ctx;
char helping [NAME_BYTE_LEN+USERNAME_BYTE_LENGTH+2];
char helping [NAME_LEN+USERNAME_LENGTH+2];
uint len;
bool error= 1;