Commit ee7f73d4 authored by unknown's avatar unknown
Browse files

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

mysql-test/t/lowercase_table_grant.test

+3 −0
Original line number Diff line number Diff line 
# Don't test with embedded server

-- source include/not_embedded.inc



# Test of grants when lower_case_table_names is on

use mysql;

mysql-test/t/skip_name_resolve.test

+3 −0
Original line number Diff line number Diff line 
# 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';

sql/sql_parse.cc

+3 −0
Original line number Diff line number Diff line
@@ -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*/

    }