Commit ee7f73d4 authored by unknown's avatar unknown

Clean up merge of fix for Bug #9468.


mysql-test/t/lowercase_table_grant.test:
  Disable test with embedded server
mysql-test/t/skip_name_resolve.test:
  Disable test with embedded server
sql/sql_parse.cc:
  Reset server status after a single statement in a multistatement
  query is handled in embedded server so it is not logged twice to
  the slow query log.
parent dd882cfb
# Don't test with embedded server
-- source include/not_embedded.inc
# Test of grants when lower_case_table_names is on
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
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';
......
......@@ -1546,6 +1546,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
}
else
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;
#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