diff options
| author | dlenev@brandersnatch.localdomain <> | 2004-12-29 23:39:44 +0300 |
|---|---|---|
| committer | dlenev@brandersnatch.localdomain <> | 2004-12-29 23:39:44 +0300 |
| commit | e35694802ba04138d01a1d7862a6a479ce0fb9df (patch) | |
| tree | 15599b4d7c8b4aafa3f013707ae39fa6aae1d19f /mysql-test/r | |
| parent | a8deefa3dd150a2fdbe35e26fb573ee0088458a2 (diff) | |
| download | mariadb-git-e35694802ba04138d01a1d7862a6a479ce0fb9df.tar.gz | |
WL#1339. More post-merge fixes.
Updated test results after adding max_user_connections column
to mysql.user table.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/grant.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/information_schema.result | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 629a3221330..9803c7301a2 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -10,8 +10,8 @@ GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3 GRANT SELECT ON `mysqltest`.* TO 'mysqltest_1'@'localhost' grant delete on mysqltest.* to mysqltest_1@localhost; select * from mysql.user where user="mysqltest_1"; -Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections -localhost mysqltest_1 N N N N N N N N N N N N N N N N N N N N N 0 0 0 +Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections max_user_connections +localhost mysqltest_1 N N N N N N N N N N N N N N N N N N N N N 0 0 0 0 show grants for mysqltest_1@localhost; Grants for mysqltest_1@localhost GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA' diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 037588afda8..e7d0df1da58 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -608,6 +608,7 @@ Create_routine_priv select,insert,update,references Alter_routine_priv select,insert,update,references max_questions select,insert,update,references max_connections select,insert,update,references +max_user_connections select,insert,update,references use test; create function sub1(i int) returns int return i+1; |