Merge branch 'mysql-5.7' into mysql-8.0

maras007 · maras007 · commit b5c584cc83ab · 2021-06-04T20:18:57.000+02:00
diff --git a/share/messages_to_clients.txt b/share/messages_to_clients.txt
@@ -9574,6 +9574,9 @@ ER_WARN_SQL_AFTER_MTS_GAPS_GAP_NOT_CALCULATED
 ER_INVALID_ASSIGNMENT_TARGET 42000
   eng "Invalid target for assignment in INSERT or UPDATE statement '%.192s'."
 
+ER_WARN_AUDIT_LOG_FORMAT_UNIX_TIMESTAMP_ONLY_WHEN_JSON
+  eng "audit_log_format_unix_timestamp is applicable only when audit_log_format = JSON."
+
 #
 #  End of 8.0 error messages (server-to-client).
 #  Do NOT add messages intended for the error log above!
diff --git a/share/messages_to_error_log.txt b/share/messages_to_error_log.txt
@@ -11394,6 +11394,9 @@ ER_IB_MSG_RECOVERY_NO_SPACE_IN_REDO_LOG__SKIP_IBUF_MERGES
 ER_IB_MSG_RECOVERY_NO_SPACE_IN_REDO_LOG__UNEXPECTED
   eng "There is not enough free space in the redo log during recovery, restore from backup (or retry with --innodb-force-recovery=6)."
 
+ER_WARN_AUDIT_LOG_FORMAT_UNIX_TIMESTAMP_ONLY_WHEN_JSON_LOG
+  eng "audit_log_format_unix_timestamp is applicable only when audit_log_format = JSON."
+
 # This error is not supposed to be reported to the users. It is only
 # meant for internal use to signal that a statement should be
 # reprepared for the primary storage engine, without transformations.

Original file line number	Diff line number	Diff line change
`@@ -9574,6 +9574,9 @@ ER_WARN_SQL_AFTER_MTS_GAPS_GAP_NOT_CALCULATED`
`9574`	`9574`	`ER_INVALID_ASSIGNMENT_TARGET 42000`
`9575`	`9575`	`eng "Invalid target for assignment in INSERT or UPDATE statement '%.192s'."`
`9576`	`9576`
	`9577`	`+ER_WARN_AUDIT_LOG_FORMAT_UNIX_TIMESTAMP_ONLY_WHEN_JSON`
	`9578`	`+ eng "audit_log_format_unix_timestamp is applicable only when audit_log_format = JSON."`
	`9579`	`+`
`9577`	`9580`	`#`
`9578`	`9581`	`# End of 8.0 error messages (server-to-client).`
`9579`	`9582`	`# Do NOT add messages intended for the error log above!`