From c73762dbdfa67c82c7887a0b3be9d1a0f5602bdf Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Jan 2005 20:38:05 -0600 Subject: user_limits.result: Fix test result affected by error message rewording. errmsg.txt: Reword error messages. set_var.cc: Reorder variables. mysqld.cc: Reorder options. sql/mysqld.cc: Reorder options. sql/set_var.cc: Reorder variables. sql/share/errmsg.txt: Reword error messages. mysql-test/r/user_limits.result: Fix test result affected by error message rewording. --- mysql-test/r/user_limits.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r') diff --git a/mysql-test/r/user_limits.result b/mysql-test/r/user_limits.result index ec7adcdfe3c..b374b05e3f0 100644 --- a/mysql-test/r/user_limits.result +++ b/mysql-test/r/user_limits.result @@ -77,7 +77,7 @@ select @@session.max_user_connections, @@global.max_user_connections; select * from t1; i connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK); -ERROR 42000: User mysqltest_1 has already more than 'max_user_connections' active connections +ERROR 42000: User mysqltest_1 already has more than 'max_user_connections' active connections grant usage on *.* to mysqltest_1@localhost with max_user_connections 3; select @@session.max_user_connections, @@global.max_user_connections; @@session.max_user_connections @@global.max_user_connections -- cgit v1.2.1