diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result index 7bddddb44a2..7c658e17c55 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result @@ -1,9 +1,28 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); flush status; flush hosts; +flush user_resources; +flush privileges; select @@global.debug; @@global.debug +select @@global.max_connect_errors; +@@global.max_connect_errors +100 +select @@global.max_user_connections; +@@global.max_user_connections +0 +select @@global.max_connections; +@@global.max_connections +151 +select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '192.%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like '2001:%'; +User Host +select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; +User Host grant select on test.* to 'root'@'192.0.2.4'; select "Con1 is alive"; Con1 is alive @@ -11,7 +30,7 @@ Con1 is alive select current_user(); current_user() root@localhost -set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; +set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; select "Con2 is alive"; Con2 is alive Con2 is alive @@ -82,4 +101,4 @@ FIRST_ERROR_SEEN set LAST_ERROR_SEEN set revoke select on test.* from 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4'; -set global debug= default; +set global debug_dbug= default; |