diff --git a/client/base/help_options.cc b/client/base/help_options.cc
index 78cef0df51..0aad48e5d6 100644
--- a/client/base/help_options.cc
+++ b/client/base/help_options.cc
@@ -88,14 +88,14 @@ void Mysql::Tools::Base::Options::Help_options::print_usage()
 
   if (first_year_str == COPYRIGHT_NOTICE_CURRENT_YEAR)
   {
-    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE("2021");
+    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR);
   }
   else
   {
 #define FIRST_YEAR_CONSTANT "$first_year$"
     string first_year_constant_str= FIRST_YEAR_CONSTANT;
 
-    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE("2021");
+    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR);
     copyright= copyright.replace(copyright.find(first_year_constant_str),
                                  first_year_constant_str.length(), first_year_str);
   }
diff --git a/client/check/mysqlcheck.cc b/client/check/mysqlcheck.cc
index 037f3f9c6f..dc5054914e 100644
--- a/client/check/mysqlcheck.cc
+++ b/client/check/mysqlcheck.cc
@@ -246,7 +246,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("This program can be used to CHECK (-c, -m, -C), REPAIR (-r), ANALYZE (-a),");
   puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");
   puts("used at the same time. Not all options are supported by all storage engines.");
diff --git a/client/mysql.cc b/client/mysql.cc
index b6f24d0e9f..bdfb5623a8 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1363,7 +1363,7 @@ int main(int argc,char *argv[])
 	   mysql_thread_id(&mysql), server_version_string(&mysql));
   put_info((char*) glob_buffer.ptr(),INFO_INFO);
 
-  put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"), INFO_INFO);
+  put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR), INFO_INFO);
 
   if (!status.batch)
   {
@@ -1925,7 +1925,7 @@ static void usage(int version)
 
   if (version)
     return;
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Usage: %s [OPTIONS] [database]\n", my_progname);
   /*
     Turn default for zombies off so that the help on how to 
diff --git a/client/mysql_config_editor.cc b/client/mysql_config_editor.cc
index a99d8b3245..c2cf81eafb 100644
--- a/client/mysql_config_editor.cc
+++ b/client/mysql_config_editor.cc
@@ -1470,7 +1470,7 @@ static void my_perror(const char *msg)
 static void usage_command(int command)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("MySQL Configuration Utility.");
   printf("\nDescription: %s\n", command_data[command].description);
   printf("Usage: %s [program options] [%s [command options]]\n",
@@ -1483,7 +1483,7 @@ static void usage_command(int command)
 static void usage_program(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("MySQL Configuration Utility.");
   printf("Usage: %s [program options] [command [command options]]\n",
          my_progname);
diff --git a/client/mysql_install_db.cc b/client/mysql_install_db.cc
index e0e6a34c4e..580185bc0b 100644
--- a/client/mysql_install_db.cc
+++ b/client/mysql_install_db.cc
@@ -329,7 +329,7 @@ void print_version(const string &p)
 void usage(const string &p)
 {
   print_version(p);
-  cout << ORACLE_WELCOME_COPYRIGHT_NOTICE("2021") << endl
+  cout << ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR) << endl
        << "MySQL Database Deployment Utility." << endl
        << "Usage: "
        << p
diff --git a/client/mysql_secure_installation.cc b/client/mysql_secure_installation.cc
index 075677e7d5..59bd3fbe10 100644
--- a/client/mysql_secure_installation.cc
+++ b/client/mysql_secure_installation.cc
@@ -102,7 +102,7 @@ static void print_version(void)
 static void usage()
 {
   print_version();
-  fprintf(stdout, ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  fprintf(stdout, ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   fprintf(stdout, "\nMySQL Configuration Utility.");
   fprintf(stdout, "Usage: %s [OPTIONS]\n", my_progname);
   my_print_help(my_connection_options);
diff --git a/client/mysql_ssl_rsa_setup.cc b/client/mysql_ssl_rsa_setup.cc
index 70f938178d..1ac04842a4 100644
--- a/client/mysql_ssl_rsa_setup.cc
+++ b/client/mysql_ssl_rsa_setup.cc
@@ -424,7 +424,7 @@ static
 void usage(void)
 {
   print_version();
-  cout << (ORACLE_WELCOME_COPYRIGHT_NOTICE("2021")) << endl
+  cout << (ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR)) << endl
        << "MySQL SSL Certificate and RSA Key Generation Utility" << endl
        << "Usage : " << my_progname << " [OPTIONS]" << endl;
 
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index 11a268c3fd..2822d80fe1 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -785,7 +785,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     case ADMIN_VER:
       new_line=1;
       print_version();
-      puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+      puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
       printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
       printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
       printf("Connection\t\t%s\n",mysql_get_host_info(mysql));
@@ -1279,7 +1279,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Administration program for the mysqld daemon.");
   printf("Usage: %s [OPTIONS] command command....\n", my_progname);
   /*
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index e47b8edf28..a9b55f5dc0 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -2070,7 +2070,7 @@ static void print_version()
 static void usage()
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("\
 Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
 the mysql command line client.\n\n");
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 31bcf55f4b..0784f1a574 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -666,7 +666,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Dumping structure and contents of MySQL databases and tables.");
   short_usage_sub();
 #if defined(STONEDB)
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 5a890ac389..9a651a42f3 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -225,7 +225,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("\
 Loads tables from text files in various formats.  The base name of the\n\
 text file must be the name of the table that should be used.\n\
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 651097908e..87d5389d1b 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -304,7 +304,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Shows the structure of a MySQL database (databases, tables, and columns).\n");
   printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
   puts("\n\
diff --git a/client/mysqlslap.cc b/client/mysqlslap.cc
index 72b46446a5..440b20c4bb 100644
--- a/client/mysqlslap.cc
+++ b/client/mysqlslap.cc
@@ -741,7 +741,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Run a query multiple times against the server.\n");
   printf("Usage: %s [OPTIONS]\n",my_progname);
   print_defaults("my",load_default_groups);
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index ca3f30d716..53b1847c05 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -7200,7 +7200,7 @@ void print_version(void)
 void usage()
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Runs a test against the mysql server and compares output with a results file.\n\n");
   printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
   my_print_help(my_long_options);
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index 0365bca2a6..d4e6cf3007 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -982,7 +982,7 @@ static void print_version(void)
 static void usage(void)
 {
 	print_version();
-	puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+	puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
 	printf("InnoDB offline file checksum utility.\n");
 	printf("Usage: %s [-c] [-s <start page>] [-e <end page>] "
 		"[-p <page>] [-v]  [-a <allow mismatches>] [-n] "
diff --git a/extra/lz4_decompress.cc b/extra/lz4_decompress.cc
index 198eb59ddb..342c2ddfc4 100644
--- a/extra/lz4_decompress.cc
+++ b/extra/lz4_decompress.cc
@@ -32,7 +32,7 @@ static void usage()
 {
   printf("%s  Ver 1.7 for %s at %s\n","lz4_decompress",SYSTEM_TYPE,
 	 MACHINE_TYPE);
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Decompress data compressed by mysqlpump using lz4 compression "
     "algorithm by reading from input file and writing uncompressed "
     "data to output file");
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index 76376fcfa4..fc6d9dec7a 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -115,7 +115,7 @@ static void usage(my_bool version)
 	 MACHINE_TYPE);
   if (version)
     return;
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Prints all arguments that is give to some program using the default files");
   printf("Usage: %s [OPTIONS] groups\n", my_progname);
   my_print_help(my_long_options);
diff --git a/extra/perror.c b/extra/perror.c
index 00687ef24e..df312cc50c 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -91,7 +91,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Print a description for a system error code or a MySQL error code.\n");
   printf("If you want to get the error for a negative error code, you should use\n-- before the first error code to tell perror that there was no more options.\n\n");
   printf("Usage: %s [OPTIONS] [ERRORCODE [ERRORCODE...]]\n",my_progname);
diff --git a/extra/resolve_stack_dump.cc b/extra/resolve_stack_dump.cc
index d3c908ae2e..4d89069920 100644
--- a/extra/resolve_stack_dump.cc
+++ b/extra/resolve_stack_dump.cc
@@ -88,7 +88,7 @@ static void print_version(void)
 static void usage()
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Resolve numeric stack strace dump into symbols.\n\n");
   printf("Usage: %s [OPTIONS] symbols-file [numeric-dump-file]\n",
 	 my_progname);
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h
index 2df6dba7e5..e5f4629685 100644
--- a/include/welcome_copyright_notice.h
+++ b/include/welcome_copyright_notice.h
@@ -23,6 +23,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
+#define COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR "2021"
 #define COPYRIGHT_NOTICE_CURRENT_YEAR "2022"
 
 /*
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index 0ffbee09aa..fb5ce26d8d 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -354,7 +354,7 @@ int main(int argc,char **argv)
   printf("/*\n\n  Do " "not " "edit " "this " "file " "directly!\n\n*/\n");
 
   puts("/*");
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("*/");
 
   /* Broken up to indicate that it's not advice to you, gentle reader. */
diff --git a/sql/gen_lex_token.cc b/sql/gen_lex_token.cc
index de89e8576d..905882d379 100644
--- a/sql/gen_lex_token.cc
+++ b/sql/gen_lex_token.cc
@@ -387,7 +387,7 @@ void print_tokens()
 int main(int argc,char **argv)
 {
   puts("/*");
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("*/");
 
   printf("/*\n");
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index fe001528c9..dcae3a754b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7113,7 +7113,7 @@ static void usage(void)
   if (!default_collation_name)
     default_collation_name= (char*) default_charset_info->name;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Starts the MySQL database server.\n");
   printf("Usage: %s [OPTIONS]\n", my_progname);
   if (!opt_verbose)
diff --git a/storage/archive/archive_reader.c b/storage/archive/archive_reader.c
index 3e2bcce916..8d69c4190e 100644
--- a/storage/archive/archive_reader.c
+++ b/storage/archive/archive_reader.c
@@ -395,7 +395,7 @@ static struct my_option my_long_options[] =
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
 
   puts("Read and modify Archive files directly\n");
   printf("Usage: %s [OPTIONS] file_to_be_looked_at [file_for_backup]\n", my_progname);
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index 552ac87663..defc5f41bc 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
@@ -328,7 +328,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2021"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
 
   puts("Pack a MyISAM-table to take much less space.");
   puts("Keys are not updated, you must run myisamchk -rq on the datafile");