diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
| commit | 056ac55aa0954b3321aa5e838a5563e731c1c516 (patch) | |
| tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /mysql-test/t/user_limits.test | |
| parent | a6daa9ada052b7b7b09683ea6d565c92f5e15512 (diff) | |
| parent | 3701208a2e890d42aabc678a2a5d4ea539941b36 (diff) | |
| download | mariadb-git-056ac55aa0954b3321aa5e838a5563e731c1c516.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'mysql-test/t/user_limits.test')
| -rw-r--r-- | mysql-test/t/user_limits.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/user_limits.test b/mysql-test/t/user_limits.test index 41af032b97e..1bf3f9a3103 100644 --- a/mysql-test/t/user_limits.test +++ b/mysql-test/t/user_limits.test @@ -132,7 +132,7 @@ drop user mysqltest_1@localhost; select @@session.max_user_connections, @@global.max_user_connections; # Local max_user_connections variable can't be set directly # since this limit is per-account ---error ER_GLOBAL_VARIABLE +--error ER_VARIABLE_IS_READONLY set session max_user_connections= 2; # But it is ok to set global max_user_connections set global max_user_connections= 2; |