MDEV-12182 post-merge

* fix plugin version * don't print :unavaliable for localhost

Author: vuvova

include/mysql/plugin_audit.h

@@ -66,6 +66,7 @@ struct mysql_event_general
  unsigned long long general_rows;
  /* Added in version 0x302 */
  unsigned long long query_id;
+ /* Added in version 0x303 */
  unsigned int port;
  MYSQL_CONST_LEX_STRING database;
 };

mysql-test/suite/plugins/r/server_audit.result

@@ -171,8 +171,7 @@ set global server_audit_incl_users='user1';
 create user user1@localhost;
 grant all on sa_db.* to user1@localhost;
 
-connect (cn1,localhost,user1,,sa_db);
-connection cn1;
+connect (cn1,127.0.0.1,user1,,sa_db,$MASTER_MYPORT);
 
 create table t1(id int) engine=myisam;
 insert delayed into t1 values (1);
@@ -204,7 +203,6 @@ connect(plug_con,localhost,plug,plug_dest);
 GRANT PROXY ON plug_dest TO plug;
 --sleep 2
 connect(plug_con,localhost,plug,plug_dest,"*NO-ONE*");
-connection plug_con;
 select USER(),CURRENT_USER();
 connection default;
 disconnect plug_con;
@@ -252,7 +250,7 @@ uninstall plugin server_audit;
 # replace stored SSL verison with constant string "TLS_VERSION"
 --replace_result $ssl_version TLS_VERSION
 # replace the timestamp and the hostname with constant values
---replace_regex /[0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9][0-9]*\,/,1,/ /\,[1-9][0-9]*/,ID/
+--replace_regex /\d* \d\d:\d\d:\d\d\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9]\d*\,/,1,/ /\,[1-9]\d*/,ID/ /:\d+,/:PORT,/
 cat_file $MYSQLD_DATADIR/server_audit.log;
 remove_file $MYSQLD_DATADIR/server_audit.log;
 --enable_ps2_protocol

mysql-test/suite/plugins/r/thread_pool_server_audit.result

@@ -144,8 +144,11 @@ uninstall plugin server_audit;
 --enable_ps2_protocol
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
+if ($MARIADB_UPGRADE_EXE) { # windows
+ let $replace_port= /localhost:\d+/localhost/;
+}
 # replace the timestamp, hostname, and port number with constant values
---replace_regex /[0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9][0-9]*\,/,1,/ /\,[1-9][0-9]*/,ID/ /,localhost:([0-9]+|unavailable)/,localhost:port/
+--replace_regex /\d* \d\d:\d\d:\d\d\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9]\d*\,/,1,/ /\,[1-9]\d*/,ID/ $replace_port
 cat_file $MYSQLD_DATADIR/server_audit.log;
 remove_file $MYSQLD_DATADIR/server_audit.log;
 

mysql-test/suite/plugins/t/server_audit.test

@@ -15,8 +15,8 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
 
-#define PLUGIN_VERSION 0x104
-#define PLUGIN_STR_VERSION "1.5.14"
+#define PLUGIN_VERSION 0x105
+#define PLUGIN_STR_VERSION "1.5.0"
 
 #define _my_thread_var loc_thread_var
 
@@ -1458,10 +1458,9 @@ static size_t log_header(char *message, size_t message_len,
  host= userip;
  }
  if (port == 0) {
- strncpy(port_str, "unavailable", sizeof(port_str) - 1);
- port_str[sizeof(port_str) - 1] = '\0'; 
+ port_str[0] = '\0';
  } else {
- my_snprintf(port_str, sizeof(port_str), "%u", port);
+ my_snprintf(port_str, sizeof(port_str), ":%u", port);
  }
 
  /*
@@ -1476,15 +1475,15 @@ static size_t log_header(char *message, size_t message_len,
 
  if (output_type == OUTPUT_SYSLOG)
  return my_snprintf(message, message_len,
- "%.*s,%.*s,%.*s:%s,%d,%lld,%s",
+ "%.*s,%.*s,%.*s%s,%d,%lld,%s",
  (int) serverhost_len, serverhost,
  username_len, username,
  host_len, host, port_str,
  connection_id, query_id, operation);
 
  (void) localtime_r(ts, &tm_time);
  return my_snprintf(message, message_len,
- "%04d%02d%02d %02d:%02d:%02d,%.*s,%.*s,%.*s:%s,%d,%lld,%s",
+ "%04d%02d%02d %02d:%02d:%02d,%.*s,%.*s,%.*s%s,%d,%lld,%s",
  tm_time.tm_year+1900, tm_time.tm_mon+1, tm_time.tm_mday,
  tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec,
  (int) serverhost_len, serverhost,
@@ -2048,8 +2047,6 @@ static int log_table(const struct connection_info *cn,
  char message[1024];
  time_t ctime;
 
-
-
  (void) time(&ctime);
  csize= log_header(message, sizeof(message)-1, &ctime,
  servhost, servhost_len,