summaryrefslogtreecommitdiff
path: root/sql/tztime.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-12-11 00:11:43 +0100
committerSergei Golubchik <serg@mariadb.org>2023-01-19 12:39:28 +0100
commiteb26bf6e09f714bfeda8e411b411b4991edf1c4d (patch)
tree0962cb1e582513a7c044a424c3b8885a2c9e1f03 /sql/tztime.cc
parent314e50b464e31a45c791ea47661efdadf924cfc5 (diff)
downloadmariadb-git-eb26bf6e09f714bfeda8e411b411b4991edf1c4d.tar.gz
unify client/tool version string
it should now always be /path/to/exe Ver <tool version> Distrib <server version> for <OS> (<ARCH>) in all tools and clients
Diffstat (limited to 'sql/tztime.cc')
-rw-r--r--sql/tztime.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 2e39a20fc91..57f1ab872ee 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -29,6 +29,7 @@
#pragma implementation // gcc: Class implementation
#endif
+#define VER "1.1"
#include "mariadb.h"
#if !defined(TZINFO2SQL) && !defined(TESTTIME)
#include "sql_priv.h"
@@ -43,6 +44,7 @@
#include <my_getopt.h>
#endif
+#include <welcome_copyright_notice.h>
#include "tztime.h"
#include "tzfile.h"
#include <m_string.h>
@@ -64,8 +66,6 @@
#endif /* !defined(DBUG_OFF) */
#endif /* defined(TZINFO2SQL) || defined(TESTTIME) */
-#define PROGRAM_VERSION "1.1"
-
/* Structure describing local time type (e.g. Moscow summer time (MSD)) */
typedef struct ttinfo
{
@@ -2666,12 +2666,6 @@ static my_bool get_one_option(const struct my_option *, const char *,
const char *);
C_MODE_END
-static void print_version(void)
-{
- printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname, PROGRAM_VERSION,
- MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
-}
-
static const char *default_timezone_dir= "/usr/share/zoneinfo/";