Merge branch 'mysql-5.6' into mysql-5.7

Conflicts:
	mysql-test/suite/perfschema/r/misc.result
	mysql-test/suite/perfschema/t/misc.test
	storage/perfschema/pfs.cc

Author: Christopher Powers

mysql-test/suite/perfschema/r/misc.result

@@ -108,3 +108,18 @@ Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	E
 show events where Db= 'performance_schema';
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 use test;
+use test;
+truncate performance_schema.events_statements_history;
+truncate performance_schema.events_statements_history_long;
+select * from t1;
+ERROR 42S02: Table 'test.t1' doesn't exist
+
+select sql_text, mysql_errno, returned_sqlstate, message_text, errors, warnings
+from performance_schema.events_statements_history where errors > 0;
+sql_text	mysql_errno	returned_sqlstate	message_text	errors	warnings
+select * from t1	1146	42S02	Table 'test.t1' doesn't exist	1	0
+
+select sql_text, mysql_errno, returned_sqlstate, message_text, errors, warnings from 
+performance_schema.events_statements_history_long where errors > 0;
+sql_text	mysql_errno	returned_sqlstate	message_text	errors	warnings
+select * from t1	1146	42S02	Table 'test.t1' doesn't exist	1	0

mysql-test/suite/perfschema/t/misc.test

@@ -185,3 +185,23 @@ show events from performance_schema;
 show events where Db= 'performance_schema';
 use test;
 
+
+#
+# Bug#11929832 - EVENTS_STATEMENTS_HISTORY HAS ERRORS=0 WHEN THERE ARE ERRORS
+#
+# Verify that SQL errors are properly counted.
+
+use test;
+truncate performance_schema.events_statements_history;
+truncate performance_schema.events_statements_history_long;
+
+--error ER_NO_SUCH_TABLE
+select * from t1;
+
+--echo 
+select sql_text, mysql_errno, returned_sqlstate, message_text, errors, warnings
+  from performance_schema.events_statements_history where errors > 0;
+  
+--echo
+select sql_text, mysql_errno, returned_sqlstate, message_text, errors, warnings from 
+  performance_schema.events_statements_history_long where errors > 0;

storage/perfschema/pfs.cc

@@ -5346,6 +5346,7 @@ void pfs_end_statement_v1(PSI_statement_locker *locker, void *stmt_da)
           pfs->m_message_text[MYSQL_ERRMSG_SIZE]= 0;
           pfs->m_sql_errno= da->mysql_errno();
           memcpy(pfs->m_sqlstate, da->returned_sqlstate(), SQLSTATE_LENGTH);
+          pfs->m_error_count++;
           break;
         case Diagnostics_area::DA_DISABLED:
           break;