diff options
| author | unknown <monty@mysql.com> | 2004-05-06 13:42:26 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-06 13:42:26 +0300 |
| commit | 445148f08339db0cc32c5254f31f8629fedd2af0 (patch) | |
| tree | 9a75e17ac46c0c2c536c9050f133f4319e09c69e /sql | |
| parent | cc7a8d9bed2193dc3d424b19cac456477db6e6f5 (diff) | |
| parent | 2d776e36d8dd205efccc18a75292308fd4c5d385 (diff) | |
| download | mariadb-git-445148f08339db0cc32c5254f31f8629fedd2af0.tar.gz | |
Merge with 4.0 to get security patch for check_grant_colum
innobase/include/os0file.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/rpl_server_id2.result:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/slave.cc:
Merge with 4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index adf3ac0d6a0..201ec8f183f 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4817,7 +4817,7 @@ innodb_show_status( rewind(srv_monitor_file); srv_printf_innodb_monitor(srv_monitor_file); flen = ftell(srv_monitor_file); - my_chsize(fileno(srv_monitor_file), flen, 0, MYF(0)); + os_file_set_eof(srv_monitor_file); if(flen > 64000 - 1) { flen = 64000 - 1; } diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 27aaf06d872..b2d030b523d 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2764,9 +2764,9 @@ bool check_grant_column(THD *thd,TABLE *table, const char *name, if (table->grant.version != grant_version) { table->grant.grant_table= - table_hash_search(thd->host,thd->ip,thd->db, + table_hash_search(thd->host, thd->ip, table->table_cache_key, thd->priv_user, - table->real_name,0); /* purecov: inspected */ + table->real_name, 0); /* purecov: inspected */ table->grant.version=grant_version; /* purecov: inspected */ } if (!(grant_table=table->grant.grant_table)) @@ -3161,7 +3161,7 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user) /* Add database access */ for (counter=0 ; counter < acl_dbs.elements ; counter++) { - const char *user,*host; + const char *user, *host; acl_db=dynamic_element(&acl_dbs,counter,ACL_DB*); if (!(user=acl_db->user)) |