diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-14 09:15:07 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-16 10:16:57 +0200 |
| commit | 149d01743b80670fef2a107172d3b0916734a37d (patch) | |
| tree | bef6cfe208005b4ff384f1668b54c2f1b9ff7516 | |
| parent | bc2dbdb601e0c55b61c2ecbe2e64c119e41fec70 (diff) | |
| download | mariadb-git-bb-10.2-mysqltest.tar.gz | |
Fix renamed constant.bb-10.2-mysqltest
| -rw-r--r-- | client/mysqltest.cc | 4 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 4 | ||||
| m--------- | libmariadb | 0 |
3 files changed, 6 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 2a9560e8903..ab05d5c8cb9 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -7736,8 +7736,8 @@ static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql) case SESSION_TRACK_TRANSACTION_CHARACTERISTICS: dynstr_append(ds, "Tracker : SESSION_TRACK_TRANSACTION_CHARACTERISTICS\n"); break; - case SESSION_TRACK_TRANSACTION_TYPE: - dynstr_append(ds, "Tracker : SESSION_TRACK_TRANSACTION_TYPE\n"); + case SESSION_TRACK_TRANSACTION_STATE: + dynstr_append(ds, "Tracker : SESSION_TRACK_TRANSACTION_STATE\n"); break; default: DBUG_ASSERT(0); diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index f22e00dabb9..e4db942142e 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -17,9 +17,13 @@ #define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ +#ifndef MYSQL_PORT #define MYSQL_PORT @MYSQL_TCP_PORT@ +#endif #define MYSQL_PORT_DEFAULT @MYSQL_TCP_PORT_DEFAULT@ +#ifndef MYSQL_UNIX_ADDR #define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@" +#endif #define MYSQL_CONFIG_NAME "my" #define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" diff --git a/libmariadb b/libmariadb -Subproject a746c3af449a8754e78ad7971e59e79af7957cd +Subproject 086f810ba4450e4b7d11509e807128be62ea052 |