Skip to content

Commit bc045f8

Browse files
dahlerlendrafalmol-mysql
authored andcommitted
Bug#32210815 REMOVE "ALL RIGHTS RESERVED TEXT" REFERENCES FROM COPYRIGHT HEADER IN USER VISIBLE TEXT
Patch for 5.6. Change-Id: Ib90027051452599559cbc50eff102dcbb1480fed (cherry picked from commit 3e5eab8265f97c19c7fc77d1f186f7f3ce739f63)
1 parent a6a7f70 commit bc045f8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/welcome_copyright_notice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
#define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
3333
(strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \
3434
"Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \
35-
"Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \
35+
"Oracle and/or its affiliates.\n\nOracle is a " \
3636
"registered trademark of Oracle Corporation and/or its\naffiliates. " \
3737
"Other names may be trademarks of their respective\nowners.\n" : \
3838
"Copyright (c) " first_year ", Oracle and/or its affiliates. " \
39-
"All rights reserved.\n\nOracle is a registered trademark of " \
39+
"\n\nOracle is a registered trademark of " \
4040
"Oracle Corporation and/or its\naffiliates. Other names may be " \
4141
"trademarks of their respective\nowners.\n")
4242

mysql-test/r/mysql_config_editor.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ user = test_user4
100100
##############################################
101101
# Tests for mysql_config_editor's help command
102102
##############################################
103-
Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
103+
Copyright (c) 2012, 2021, Oracle and/or its affiliates.
104104

105105
Oracle is a registered trademark of Oracle Corporation and/or its
106106
affiliates. Other names may be trademarks of their respective

0 commit comments

Comments
 (0)