Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 40 insertions, 0 deletions

diff --git a/mysql-test/main/userstat-badlogin-4824.test b/mysql-test/main/userstat-badlogin-4824.test
new file mode 100644
index 00000000..e14eded3
--- /dev/null
+++ b/mysql-test/main/userstat-badlogin-4824.test
@@ -0,0 +1,40 @@
+#
+# MDEV-4824 userstats - wrong user statistics
+#
+# Tests will be skipped for the view protocol because the view protocol creates 
+# an additional util connection and other statistics data
+-- source include/no_view_protocol.inc
+
+--source include/not_embedded.inc
+set @save_userstat=@@global.userstat;
+
+create user foo@localhost identified by 'foo';
+flush user_statistics;
+set global userstat=1;
+
+--disable_ps2_protocol
+connect(foo, localhost, foo, foo, "*NO-ONE*");
+select 1;
+disconnect foo;
+connection default;
+
+# wait for user_statistics changes to become visible
+let $wait_condition= select count(*) = 1 from information_schema.processlist;
+--source include/wait_condition.inc
+
+# 41 is for ps-procotol
+--replace_result 41 18
+select user, bytes_received from information_schema.user_statistics where user = 'foo';
+
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_ACCESS_DENIED_ERROR
+connect(foo, localhost, foo, bar, test);
+
+connection default;
+
+--replace_result 41 18
+select user, bytes_received from information_schema.user_statistics where user = 'foo';
+--enable_ps2_protocol
+
+drop user foo@localhost;
+set global userstat=@save_userstat;