Commit 623a5d5a authored by jimw@mysql.com's avatar jimw@mysql.com

Clean up merge of fix for Bug #9468.

parent 16efc3e3
# Don't test with embedded server
-- source include/not_embedded.inc
# Test of grants when lower_case_table_names is on # Test of grants when lower_case_table_names is on
use mysql; use mysql;
......
# Can't be tested with embedded server
-- source include/not_embedded.inc
# Bug #8471: IP address with mask fail when skip-name-resolve is on # Bug #8471: IP address with mask fail when skip-name-resolve is on
GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255'; GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255';
SHOW GRANTS FOR mysqltest_1@'127.0.0.1/255.255.255.255'; SHOW GRANTS FOR mysqltest_1@'127.0.0.1/255.255.255.255';
......
...@@ -1546,6 +1546,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1546,6 +1546,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
else else
thd->query_rest.copy(packet, length, thd->query_rest.charset()); thd->query_rest.copy(packet, length, thd->query_rest.charset());
thd->server_status&= ~ (SERVER_QUERY_NO_INDEX_USED |
SERVER_QUERY_NO_GOOD_INDEX_USED);
break; break;
#endif /*EMBEDDED_LIBRARY*/ #endif /*EMBEDDED_LIBRARY*/
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment