diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:10:51 -0700 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:10:51 -0700 |
| commit | 72d8b533cc102aad6be5046a0fe8b8e63ec1e218 (patch) | |
| tree | edd77fe431acee4ba0fa859a8fcb650dad971771 /mysql-test/r/information_schema_all_engines.result | |
| parent | 8122996a599fcb6dc600f27fddbed47a2579c6b8 (diff) | |
| download | mariadb-git-72d8b533cc102aad6be5046a0fe8b8e63ec1e218.tar.gz | |
Fixes for mysql-test failures
mysql-test/r/acl_roles_show_grants.result:
one can do SHOW GRANTS for himself
mysql-test/t/acl_roles_set_role-table-column-priv.test:
correct error message
mysql-test/t/acl_roles_show_grants.test:
one can SHOW GRANTS for himself
sql/sql_acl.cc:
bugfixing:
* don't assign with && - it can shortcut and the second assignment won't be executed
* correct the test in check_grant_all_columns() - want_access should not be modified
*
sql/sql_cmd.h.OTHER:
add new commands at the end
sql/sql_db.cc:
don't call acl_get() if all privileges are already satisfied
(crashes when run with --skip-grants, because acl data stuctures aren't initialized)
sql/sql_parse.cc:
* test for current_user in get_current_user()
* map explicitly specified user@host to current_user
Diffstat (limited to 'mysql-test/r/information_schema_all_engines.result')
| -rw-r--r-- | mysql-test/r/information_schema_all_engines.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result index 3e95d9892cb..62f3ee85530 100644 --- a/mysql-test/r/information_schema_all_engines.result +++ b/mysql-test/r/information_schema_all_engines.result @@ -424,4 +424,4 @@ Wildcard: inf_rmation_schema SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; table_schema count(*) information_schema 59 -mysql 27 +mysql 28 |